Cleanup debug code and commented out code