Remove omnibus4 for merge into master