Revert "feat(uninstall): improve Group Container and diagnostic discovery"

This reverts commit cb89dc53b35176f31cd12270dabc6f575d67d93f.