Revert "- fixed include (exists not)"

This reverts commit aedae58a65907dc556b2827481df4eba5c340b95.
Revert "- added last omni changes"

This reverts commit 540457102ea4504b556f5fab813049da8adf7774.