remove a bunch of cruft