Additional cleanup on ApplicationGroup model cleanup