Revert "DManager Changes"

This reverts commit 8891df506e9fe01b3ddfff202880984ea0134c56.