updated to remove db active support