Omni cleanup