Remove dependency on DS api in Dashboard