omni: frameworks cleanup