DDBNEXT-185: remove finished TODOs