Moved deep group removing to the ADS class. Re #7253.