remove cruft
remove more cruft