removed switchs