Remove some more commented out code.