Revert "add OmniSwitch"

This reverts commit 17dd34d3f7e6ad7dd544e9cc1680cf3f321234ce.