Clean up the comments from the refactor.