--- a/manifests/moco-config.pp
+++ b/manifests/moco-config.pp
@@ -197,19 +197,16 @@ class config inherits config::base {
             beetmover_aws_access_key_id => secret("beetmover-aws_access_key_id"),
             beetmover_aws_secret_access_key => secret("beetmover-aws_secret_access_key"),
             releaserunner_buildbot_configs_branch => "production",
             releaserunner_buildbot_configs => "https://hg.mozilla.org/build/buildbot-configs",
             releaserunner_gpg_key_path => "scripts/release/KEY",
         }
     }
 
-    $shipit_notifier_api_root = "http://ship-it.mozilla.org"
-    $shipit_notifier_verbose = true
-
     $slaveapi_slavealloc_url = "http://slavealloc.build.mozilla.org/api/"
     $slaveapi_inventory_url = "https://inventory.mozilla.org/en-US/tasty/v3/"
     $slaveapi_inventory_username = "releng-inventory-automation"
     $slaveapi_buildapi_url = "http://buildapi.pvt.build.mozilla.org/buildapi/"
     $slaveapi_bugzilla_username = "slaveapi@mozilla.releng.tld"
     $slaveapi_default_domain = "build.mozilla.org"
     $slaveapi_ipmi_username = "releng"
     $slaveapi_bugzilla_dev_url = "https://bugzilla-dev.allizom.org/rest/"

--- a/manifests/moco-nodes.pp
+++ b/manifests/moco-nodes.pp
@@ -611,17 +611,16 @@ node "buildbot-master81.bb.releng.scl3.m
             basedir => "build_scheduler";
         "bm81-tests_scheduler":
             master_type => "scheduler",
             basedir => "tests_scheduler";
     }
     include toplevel::server::buildmaster::mozilla
     include toplevel::mixin::selfserve_agent
     include toplevel::mixin::releaserunner
-    include toplevel::mixin::shipit_notifier
     include toplevel::mixin::buildmaster_db_maintenance
     include toplevel::mixin::bouncer_check
 }
 
 node "buildbot-master82.bb.releng.scl3.mozilla.com" {
     $aspects = [ 'high-security' ]
     $buildbot_bridge_env = "prod"
     buildmaster::buildbot_master::mozilla {

--- a/modules/config/manifests/base.pp
+++ b/modules/config/manifests/base.pp
@@ -284,28 +284,16 @@ class config::base {
     $runner_hg_mozharness_branch = "production"
 
     $runner_env_hg_share_base_dir = "/builds/hg-shared"
     $runner_env_git_share_base_dir = "/builds/git-shared"
 
     $runner_buildbot_slave_dir = ""
     $runner_clobberer_url = ""
 
-    # shipit_notifier
-
-    # shipit api root
-    $shipit_notifier_api_root = "https://ship-it.mozilla.org"
-    # shipit notifier verbosity level
-    $shipit_notifier_verbose = true
-    # mercurial repository and branch for tools
-    $shipit_notifier_tools = "https://hg.mozilla.org/build/tools"
-    $shipit_notifier_tools_branch = "default"
-    # root directory for shipit_notifier; this must be under /builds
-    $shipit_notifier_root = "/builds/shipit_notifier"
-
     # selfserve (buildapi agent)
 
     # fqdn:port of the buildmaster with which to invoke 'buildbot sendchange'
     $selfserve_agent_sendchange_master = ""
     # URL for masters.json, defaulting to $master_json from above
     $selfserve_agent_masters_json = $master_json
     # URL for branches.json
     $selfserve_agent_branches_json = ""

deleted file mode 100644
--- a/modules/shipit_notifier/manifests/init.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-class shipit_notifier {
-    include ::config
-    include dirs::builds
-    include users::builder
-    include shipit_notifier::settings
-    include shipit_notifier::services
-    include packages::mozilla::python27
-
-    python::virtualenv {
-        "${shipit_notifier::settings::root}":
-            python   => "${packages::mozilla::python27::python}",
-            require  => Class['packages::mozilla::python27'],
-            user     => "${users::builder::username}",
-            group    => "${users::builder::group}",
-            packages => [
-                "MozillaPulse==1.0",
-                "amqp==1.4.3",
-                "anyjson==0.3.3",
-                "certifi==0.0.8",
-                "kombu==3.0.12",
-                "python-dateutil==2.2",
-                "pytz==2013.7",
-                "six==1.8.0",
-            ];
-    }
-
-    file {
-        "${shipit_notifier::settings::root}/shipit_notifier.ini":
-            require => Python::Virtualenv["${shipit_notifier::settings::root}"],
-            mode    => 0600,
-            owner   => "${users::builder::username}",
-            group   => "${users::builder::group}",
-            content => template("shipit_notifier/shipit_notifier.ini.erb"),
-            show_diff => false;
-    }
-
-    mercurial::repo {
-        "shipit_notifier_tools":
-            require => Python::Virtualenv["${shipit_notifier::settings::root}"],
-            hg_repo => "${config::shipit_notifier_tools}",
-            dst_dir => "${shipit_notifier::settings::tools_dst}",
-            user    => "${users::builder::username}",
-            branch  => "${config::shipit_notifier_tools_branch}",
-    }
-}

deleted file mode 100644
--- a/modules/shipit_notifier/manifests/services.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-class shipit_notifier::services {
-    include ::config
-    include packages::mozilla::supervisor
-    include shipit_notifier::settings
-
-    supervisord::supervise {
-        "shipit_notifier":
-            command      => "${shipit_notifier::settings::root}/bin/python ${shipit_notifier::settings::tools_dst}/buildfarm/release/shipit-notifier.py -c ${shipit_notifier::settings::root}/shipit_notifier.ini",
-            user         => $::config::builder_username,
-            require      => [ File["${shipit_notifier::settings::root}/shipit_notifier.ini"],
-                              Python::Virtualenv["${shipit_notifier::settings::root}"],
-                              Mercurial::Repo["shipit_notifier_tools"]],
-            extra_config => template("${module_name}/extra_config.erb")
-    }
-}

deleted file mode 100644
--- a/modules/shipit_notifier/manifests/settings.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class shipit_notifier::settings {
-    include ::config
-
-    $root = $config::shipit_notifier_root
-    $tools_dst = "${root}/tools"
-    $logfile = "${root}/shipit_notifier.log"
-}

deleted file mode 100644
--- a/modules/shipit_notifier/templates/extra_config.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-exitcodes=0
-log_stderr=true
-log_stdout=true
-redirect_stderr=true
-stdout_logfile=<%= scope.lookupvar('shipit_notifier::settings::logfile') %>
-autorestart=true
-logfile_maxbytes=50MB
-logfile_backups=10
-stopasgroup=true
-killasgroup=true

deleted file mode 100644
--- a/modules/shipit_notifier/templates/shipit_notifier.ini.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-[api]
-api_root: https://ship-it.mozilla.org
-username: <%= scope.function_secret(['shipit_notifier_api_username']) %>
-password: <%= scope.function_secret(['shipit_notifier_api_password']) %>
-
-[shipit-notifier]
-verbose: <%= scope.lookupvar('config::shipit_notifier_verbose') %>
-
-[pulse]
-user = <%= scope.function_secret(['shipit_notifier_pulse_username']) %>
-password = <%= scope.function_secret(['shipit_notifier_pulse_password']) %>
-ssl = true

deleted file mode 100644
--- a/modules/toplevel/manifests/mixin/shipit_notifier.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-class toplevel::mixin::shipit_notifier {
-    include ::shipit_notifier
-}
-
-
-