Remove Omni stuff

Change-Id: Ibabe6652b0a835238453717e464fce91eedef79b