Remove some commented code