replace commented-out code with conditional