Clean up the comments and unnecessary code.