remove more cruft