Fix comments and remove unused code.