Get rid of some cruft