Using recent OMS refactoring allowing us to eliminate RootView and simplify code