diff --git a/java/src/org/openqa/selenium/remote/RemoteStatus.java b/java/src/org/openqa/selenium/remote/RemoteStatus.java
deleted file mode 100644
index f12cfc2c5985a..0000000000000
--- a/java/src/org/openqa/selenium/remote/RemoteStatus.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.openqa.selenium.remote;
-
-import java.util.Map;
-import org.openqa.selenium.internal.Require;
-
-@Deprecated(forRemoval = true)
-public class RemoteStatus {
-
-  private final Map<String, Object> buildInfo;
-  private final Map<String, Object> osInfo;
-
-  @SuppressWarnings("unchecked")
-  public RemoteStatus(Map<String, Object> status) {
-    Require.nonNull("Status", status);
-    buildInfo = (Map<String, Object>) status.get("build");
-    osInfo = (Map<String, Object>) status.get("os");
-  }
-
-  /**
-   * @return The release label.
-   */
-  public String getReleaseLabel() {
-    return (String) buildInfo.get("version");
-  }
-
-  /**
-   * @return The build revision.
-   */
-  public String getBuildRevision() {
-    return (String) buildInfo.get("revision");
-  }
-
-  /**
-   * @return The build time.
-   */
-  public String getBuildTime() {
-    return (String) buildInfo.get("time");
-  }
-
-  /**
-   * @return The operating system architecture.
-   */
-  public String getOsArch() {
-    return (String) osInfo.get("arch");
-  }
-
-  /**
-   * @return The operating system name.
-   */
-  public String getOsName() {
-    return (String) osInfo.get("name");
-  }
-
-  /**
-   * @return The operating system version.
-   */
-  public String getOsVersion() {
-    return (String) osInfo.get("version");
-  }
-
-  public String toString() {
-    return String.format(
-        "Build info: version: '%s', revision: '%s', time: '%s'%nOS info: arch: '%s', name: '%s',"
-            + " version: '%s'",
-        getReleaseLabel(),
-        getBuildRevision(),
-        getBuildTime(),
-        getOsArch(),
-        getOsName(),
-        getOsVersion());
-  }
-}
diff --git a/java/src/org/openqa/selenium/remote/ScreenshotException.java b/java/src/org/openqa/selenium/remote/ScreenshotException.java
index e7a2baaf351f8..20c6f0a9887b9 100644
--- a/java/src/org/openqa/selenium/remote/ScreenshotException.java
+++ b/java/src/org/openqa/selenium/remote/ScreenshotException.java
@@ -32,9 +32,4 @@ public ScreenshotException(Throwable cause) {
   public ScreenshotException(String message, Throwable cause) {
     super(message, cause);
   }
-
-  @Deprecated(forRemoval = true)
-  public String getBase64EncodedScreenshot() {
-    return null;
-  }
 }
diff --git a/py/test/selenium/webdriver/marionette/conftest.py b/py/test/selenium/webdriver/marionette/conftest.py
index 6e1b5a4442560..c3a6544e76490 100644
--- a/py/test/selenium/webdriver/marionette/conftest.py
+++ b/py/test/selenium/webdriver/marionette/conftest.py
@@ -24,6 +24,7 @@
 @pytest.fixture
 def options():
     options = FirefoxOptions()
+    options.add_argument("-remote-allow-system-access")
     return options