Remove some long commented out code.