Removed unused files and lines of code