Fix run_root in some edge cases
Remove OMNIBUS vars