[Consolidated] Different spawn groups

[Consolidated] different spawn group types into one
[Removed] unused spawn groups