Remove the addition of default groups [MJ-294]