Removing auto-generated comments.
Adding TODO.