Remove some unnecessary commented out code