Removed old TODO markers and irrelevant comments.