get rid of more cruft