Removed fixed TODO items.