- removed obsolete TODO items, one needs check