cleanup & switch to omni kernel

Change-Id: I4eab8f579b122f173beb5dd7e2b1449ad13c1980