clean up the offending code

Please don't commit commented-out code.