Cleaned up Code
-removed unused methods
-removed commented code