Remove some unneeded cruft