Revert "Add IVA OC and some changes on CPU OC"

This reverts commit 93eee4551b110227ea67b813fca9cfb24323abe1.