DDF-596: More ddms removals