Fix comments, delete dead code.