Cleanup troubleshooting code; pushing GroupType to List instead of to Dictionary