Removing unused methods and files