Removed debugging print and removed commented code