Removing unused files and fixing some mistakes