Removed commented out code and unused debugging prints