Removing comments and unused files