chg: removed switching off of switches