Removing old cruft from the codebase