Corrected some group removal ordering