Removed unused files and lines