Remove some obsolete commented-out code.