Revert "add OmniSwitch (1/3)"

This reverts commit b7195359f7a84758704bfa9bf422ee8ba6788d5b.