Remove some commented out code