Revert "(1/2) add omniswitch"

This reverts commit 28a73ffb3441541cf1e136b6b444f8fc9599626b.