Remove some uncommented code