Removed old TODO tags.