Removing unneeded cruft