diff --git a/lib/sidekiq/actor.rb b/lib/sidekiq/actor.rb
deleted file mode 100644
index 98ec86e4..00000000
--- a/lib/sidekiq/actor.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Sidekiq
-  module Actor
-
-    module ClassMethods
-      def trap_exit(*args)
-      end
-      def new_link(*args)
-        new(*args)
-      end
-    end
-
-    module InstanceMethods
-      def current_actor
-        self
-      end
-      def after(interval)
-      end
-      def alive?
-        @dead = false unless defined?(@dead)
-        !@dead
-      end
-      def terminate
-        @dead = true
-      end
-      def defer
-        yield
-      end
-    end
-
-    def self.included(klass)
-      if $TESTING
-        klass.__send__(:include, InstanceMethods)
-        klass.__send__(:extend, ClassMethods)
-      else
-        klass.__send__(:include, Celluloid)
-      end
-    end
-  end
-end
diff --git a/lib/sidekiq/fetch.rb b/lib/sidekiq/fetch.rb
index d6280dc9..8d554a5a 100644
--- a/lib/sidekiq/fetch.rb
+++ b/lib/sidekiq/fetch.rb
@@ -1,7 +1,6 @@
 require 'sidekiq'
 require 'sidekiq/util'
-require 'sidekiq/actor'
-require 'thread'
+require 'connection_pool/timed_stack'
 
 module Sidekiq
   ##
diff --git a/lib/sidekiq/manager.rb b/lib/sidekiq/manager.rb
index 296a1b4b..33199c9c 100644
--- a/lib/sidekiq/manager.rb
+++ b/lib/sidekiq/manager.rb
@@ -2,6 +2,7 @@
 require 'sidekiq/util'
 require 'sidekiq/processor'
 require 'sidekiq/fetch'
+require 'thread'
 
 module Sidekiq
 
diff --git a/lib/sidekiq/processor.rb b/lib/sidekiq/processor.rb
index 03554dfd..792ff5d6 100644
--- a/lib/sidekiq/processor.rb
+++ b/lib/sidekiq/processor.rb
@@ -1,4 +1,5 @@
 require 'sidekiq/util'
+require 'thread'
 
 module Sidekiq
   ##
diff --git a/lib/sidekiq/scheduled.rb b/lib/sidekiq/scheduled.rb
index 5a578925..0f45fe76 100644
--- a/lib/sidekiq/scheduled.rb
+++ b/lib/sidekiq/scheduled.rb
@@ -1,6 +1,5 @@
 require 'sidekiq'
 require 'sidekiq/util'
-require 'sidekiq/actor'
 require 'sidekiq/api'
 
 module Sidekiq