More Omnibus 3 cleanup