Removed, modified and added TODO items.