Removed TODO items.