Clean-up old comments and unused variables.