Remove references to account_group from code