remove a lot of cruft