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

Change-Id: I8ad3d02f039e79c9ec81c277a5861ff9cafad544