Remove unwanted files and unnecessary references to them from code