Remove some comment-out code.