removal of cruft which was never used