remove more cruft.