Removed Extra files
Removed extra classes. Commented out some functions