Get rid of some unnecessary commented out code (issue 3750)