Cleaning out some unneeded cruft