TODO added and another obsolete TODO removed