Revert "Additional MSWITCH blocks added - some bugs"

This reverts commit 2e549ce9e1e910532395fa4bd0c905a612281ccb.