chg: removed switching off of switches
Merge pull request #306 from mmklee/switch

chg: removed switching off of switches