EZP-22999: removed deprecated TODO