Removing Duplication
Removing unused files