Killed the old control group logic