removed 1 switch