remove cruft and fix test