IDEA-80056 removed todos as actually things work fine.