Closes #1400 CORE: cleanup DMS script