remove omni
made useful comments