DDF-842: code cleanup