Remove Queue group support again