Remove some now-replaced commented out code