diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj b/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
index d1e0b32d..38219744 100644
--- a/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
+++ b/src/clj/puppetlabs/services/jruby_pool_manager/impl/jruby_internal.clj
@@ -101,12 +101,6 @@
       (.setCompileMode (get-compile-mode compile-mode)))
     (set-ruby-encoding KCode/UTF8 jruby)
     (setup-profiling jruby profiler-output-file profiling-mode)
-    ;; FIXME: This was fixed in JRuby 9.2.15.0. Revert to the default of
-    ;;        "true" when taking up JRuby 10.
-    (System/setProperty "jruby.invokedynamic.yield" "false")
-    ;; This fixes a memory leak introduced in JRuby 9.4.13.0 and fixed
-    ;; in 10.0.5.0.
-    (System/setProperty "jruby.ji.class.values" "HARD_MAP")
     (initialize-scripting-container-fn jruby config)))
 
 (schema/defn ^:always-validate empty-scripting-container :- ScriptingContainer
diff --git a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
index 0aba10bc..cc550453 100644
--- a/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
+++ b/src/clj/puppetlabs/services/jruby_pool_manager/jruby_core.clj
@@ -5,10 +5,8 @@
             [puppetlabs.ring-middleware.utils :as ringutils]
             [puppetlabs.services.jruby-pool-manager.jruby-schemas :as jruby-schemas]
             [puppetlabs.services.jruby-pool-manager.impl.jruby-internal :as jruby-internal]
-            [puppetlabs.services.jruby-pool-manager.impl.jruby-agents :as jruby-agents]
             [puppetlabs.services.jruby-pool-manager.impl.jruby-events :as jruby-events]
             [clojure.java.io :as io]
-            [clojure.tools.logging :as log]
             [slingshot.slingshot :as sling]
             [puppetlabs.i18n.core :as i18n]
             [me.raynes.fs :as fs]
diff --git a/src/java/com/puppetlabs/jruby_utils/jruby/ScriptingContainer.java b/src/java/com/puppetlabs/jruby_utils/jruby/ScriptingContainer.java
index 99906891..9543d137 100644
--- a/src/java/com/puppetlabs/jruby_utils/jruby/ScriptingContainer.java
+++ b/src/java/com/puppetlabs/jruby_utils/jruby/ScriptingContainer.java
@@ -1,8 +1,6 @@
 package com.puppetlabs.jruby_utils.jruby;
 
-import org.jruby.embed.EmbedEvalUnit;
 import org.jruby.embed.EmbedRubyInstanceConfigAdapter;
-import org.jruby.runtime.Block;
 
 /**
  */