Remove remaining uses of oris