Cleaning up and removing unused files