Eliminate duns globally

Fixes #1915