[FIX] OMX code cleanup - Shutdown would not always complete properly