Removal of unneeded crud