Cheif Wahoo removal - nice start, still not enough