Removed extra functions
Removed commented code