Remove unneeded cruft