Omnify and remove overlays