Remove more commented-out code. #274.