Removed some auto-generated and old TODO comments.