EZP-22564: removed invalid todos