[#858] reduce commented out code