Clear out some cruft