diff --git a/app/processes/imap_client.rb b/app/processes/imap_client.rb
index e59eac4..2c5a149 100644
--- a/app/processes/imap_client.rb
+++ b/app/processes/imap_client.rb
@@ -2,6 +2,8 @@ class ImapClient
   VERSION="1.0.0"
 end
 
+require 'imap_daemon_heartbeat'
+require 'call_new_mail_webhook'
 require 'imap_client/rendezvous_hash'
 require 'imap_client/maybe'
 require 'imap_client/process_uid'
diff --git a/app/processes/imap_client/daemon.rb b/app/processes/imap_client/daemon.rb
index d3d4834..b818995 100644
--- a/app/processes/imap_client/daemon.rb
+++ b/app/processes/imap_client/daemon.rb
@@ -57,7 +57,6 @@ def initialize(options = {})
 
   def run
     trap_signals
-    force_class_loading
     maybe_start_profiling
 
     # If stress testing, start a log.
@@ -112,16 +111,6 @@ def clear_error_count(user_id)
 
   private
 
-
-  def force_class_loading
-    # Force ImapDaemonHeartbeat to load before we create any
-    # threads. This fixes a "Circular dependency detected while
-    # autoloading constant ImapDaemonHeartbeat" error.
-    ImapDaemonHeartbeat
-    CallNewMailWebhook
-    self.error_counts = {}
-  end
-
   def start_heartbeat_thread
     self.heartbeat_thread = Thread.new do
       heartbeat_thread_runner