Revert "add OmniSwitch (2/3)"

This reverts commit 730510a9249fb625494cf250d861d89ad580357c.