Consolidating and removing unused files