Removing all remaining AD references