Clean up of comments and unused stuff.