Clean up more things for omni