SeleniumHQ
diff --git a/‎java/spotbugs-excludes.xml‎
Lines changed: 1 addition & 6 deletions b/‎java/spotbugs-excludes.xml‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎java/src/org/openqa/selenium/firefox/FirefoxDriver.java‎
Lines changed: 0 additions & 5 deletions b/‎java/src/org/openqa/selenium/firefox/FirefoxDriver.java‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎java/src/org/openqa/selenium/firefox/xpi/BUILD.bazel‎
Lines changed: 0 additions & 42 deletions b/‎java/src/org/openqa/selenium/firefox/xpi/BUILD.bazel‎
Lines changed: 0 additions & 42 deletions
diff --git a/‎java/src/org/openqa/selenium/firefox/xpi/XpiDriverInfo.java‎
Lines changed: 0 additions & 91 deletions b/‎java/src/org/openqa/selenium/firefox/xpi/XpiDriverInfo.java‎
Lines changed: 0 additions & 91 deletions
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FindBugsFilter
-  xmlns="https://github.com/spotbugs/filter/3.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="https://github.com/spotbugs/filter/3.0.0"
   xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
 
   <Match>
@@ -63,11 +63,6 @@
     <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
   </Match>
 
-  <Match>
-    <Class name="org.openqa.selenium.firefox.xpi.XpiDriverService"/>
-    <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
-  </Match>
-
   <Match>
     <Class name="~org.openqa.selenium.grid.commands.CompletionCommand.*"/>
     <Bug pattern="DM_EXIT"/>
 
@@ -162,15 +162,10 @@ public static RemoteWebDriverBuilder builder() {
   private static FirefoxDriverCommandExecutor toExecutor(FirefoxOptions options) {
     Require.nonNull("Options to construct executor from", options);
 
-    String sysProperty = System.getProperty(SystemProperty.DRIVER_USE_MARIONETTE);
-    boolean isLegacy = (sysProperty != null && !Boolean.parseBoolean(sysProperty))
-                       || options.isLegacy();
-
     FirefoxDriverService.Builder<?, ?> builder =
       StreamSupport.stream(ServiceLoader.load(DriverService.Builder.class).spliterator(), false)
         .filter(b -> b instanceof FirefoxDriverService.Builder)
         .map(FirefoxDriverService.Builder.class::cast)
-        .filter(b -> b.isLegacy() == isLegacy)
         .findFirst().orElseThrow(WebDriverException::new);
 
     return new FirefoxDriverCommandExecutor(builder.withOptions(options).build());