DDF-596: DDMS removals