Remove more commented out code.