Con 1707

Please remove commented code