Removed unused files
Cleaned up and removed unused methods