Removing unused files and getting to good base