diff --git a/puppet/zulip/manifests/app_frontend.pp b/puppet/zulip/manifests/app_frontend.pp
index 1019834aca..48d0931ae5 100644
--- a/puppet/zulip/manifests/app_frontend.pp
+++ b/puppet/zulip/manifests/app_frontend.pp
@@ -2,6 +2,7 @@ class zulip::app_frontend {
   include zulip::rabbit
   include zulip::nginx
   include zulip::supervisor
+  include zulip::postfix_localmail
 
   $web_packages = [ # Needed for memcached usage
                     "memcached",
@@ -151,4 +152,7 @@ class zulip::app_frontend {
     owner  => 'zulip',
     group  => 'zulip',
   }
+  file { "/etc/cron.d/email-mirror":
+    ensure => absent,
+  }
 }
diff --git a/puppet/zulip_internal/manifests/prod_app_frontend.pp b/puppet/zulip_internal/manifests/prod_app_frontend.pp
index e319526780..73bef13df4 100644
--- a/puppet/zulip_internal/manifests/prod_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/prod_app_frontend.pp
@@ -101,13 +101,6 @@ class zulip_internal::prod_app_frontend {
     mode => 644,
     source => "puppet:///modules/zulip_internal/cron.d/send-digest-emails",
   }
-  file { "/etc/cron.d/email-mirror":
-    ensure => file,
-    owner  => "root",
-    group  => "root",
-    mode => 644,
-    source => "puppet:///modules/zulip/cron.d/email-mirror",
-  }
 
   # Prod has our Apple Push Notifications Service private key at
   # /etc/ssl/django-private/apns-dist.pem
diff --git a/puppet/zulip_internal/manifests/staging_app_frontend.pp b/puppet/zulip_internal/manifests/staging_app_frontend.pp
index 1c4aa4cdf5..dd291707b1 100644
--- a/puppet/zulip_internal/manifests/staging_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/staging_app_frontend.pp
@@ -1,7 +1,6 @@
 class zulip_internal::staging_app_frontend {
   include zulip_internal::base
   include zulip_internal::app_frontend
-  include zulip::postfix_localmail
 
   file { "/etc/nginx/sites-available/zulip-staging":
     require => Package["nginx-full"],
@@ -18,9 +17,6 @@ class zulip_internal::staging_app_frontend {
     target => '/etc/nginx/sites-available/zulip-staging',
     notify => Service["nginx"],
   }
-  file { "/etc/cron.d/email-mirror":
-    ensure => absent,
-  }
   file { "/etc/cron.d/active-user-stats":
     ensure => file,
     owner  => "root",
diff --git a/zproject/local_settings.py b/zproject/local_settings.py
index edeaeb3cde..4da862095e 100644
--- a/zproject/local_settings.py
+++ b/zproject/local_settings.py
@@ -145,21 +145,6 @@ GOOGLE_CLIENT_ID = "835904834568-77mtr5mtmpgspj9b051del9i9r5t4g4n.apps.googleuse
 # Administrator domain for this install
 ADMIN_DOMAIN = "zulip.com"
 
-# Email mirror configuration
-# The email of the Zulip bot that the email gateway
-# should post as
-EMAIL_GATEWAY_BOT = "emailgateway@zulip.com"
-
-EMAIL_GATEWAY_LOGIN = "emailgateway@zulip.com"
-EMAIL_GATEWAY_PASSWORD = "xxxxxxxxxxxxxxxx"
-EMAIL_GATEWAY_IMAP_SERVER = "imap.gmail.com"
-EMAIL_GATEWAY_IMAP_PORT = 993
-if DEPLOYED:
-    EMAIL_GATEWAY_IMAP_FOLDER = "INBOX"
-else:
-    # For local testing, only try to process messages in the Test folder.
-    EMAIL_GATEWAY_IMAP_FOLDER = "Test"
-
 # The email address pattern to use for auto-generated stream emails
 # The %s will be replaced with a unique token.
 if STAGING_DEPLOYED: