Remove some unneeded comments and code.