Removed unused files and removed commented out code