removed TODO items.