Remove some have commented out code.