Clean up imports to remove dependency on ViewManager, J&J