Revert "OminiPlus"

This reverts commit 012b21871663aebbe4a5a7b054eb9c54a46b5f5e.