DDF-539: removed developer todo comments