Removed obsolete TODO items.