diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index c514c380..73ed3886 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -1,159 +1,154 @@
 - project:
     name: wikimedia-fundraising-crm
     jobs:
       - '{name}-composer-{phpflavor}-docker':
           phpflavor:
               - php56:
                   image: docker-registry.wikimedia.org/releng/composer-test-php56:0.1.4
               - php72:
                   image: docker-registry.wikimedia.org/releng/composer-test-php72:0.1.0
 
 - builder:
     name: fundraising-crm-install
     builders:
       - zuul-cloner:
           projects: >
             wikimedia/fundraising/crm
             wikimedia/fundraising/crm/civicrm
             wikimedia/fundraising/crm/drupal
       - shell: |
           if [[ -d $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit ]]; then
             cd $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit && git pull
           else
             git clone https://github.com/civicrm/civicrm-buildkit.git $WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit
           fi
           $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-create-dbs.sh
           $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-populate-dbs.sh
 
 - builder:
     name: fundraising-crm-phpunit
     builders:
       - shell: |
           cd $WORKSPACE/src/wikimedia/fundraising/crm
           export PATH=$PATH:$WORKSPACE/src/wikimedia/fundraising/civicrm-buildkit/bin
           $WORKSPACE/src/wikimedia/fundraising/crm/vendor/bin/phpunit \
             --log-junit $WORKSPACE/log/junit-phpunit.xml
 
 - publisher:
     name: fundraising-crm-clean
     publishers:
      - postbuildscript:
          builders:
            - shell: |
                # Drop the MySQL databases.
                $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-drop-dbs.sh
 
          # Postbuild options are confusing, setting both to false ensures the script always runs.
          onsuccess: False
          onfailure: False
 
 - project:
     # FIXME: rename
     name: wikimedia-fundraising-civicrm
     jobs:
       - wikimedia-fundraising-civicrm
 
 - job:
     name: wikimedia-fundraising-civicrm
     # Run on isolated boxes because of messy MySQL behavior and unsafe fetches.
     node: contintLabsSlave && DebianJessie
     concurrent: true
     triggers:
       - zuul
     builders:
       - fundraising-crm-install
       - fundraising-crm-phpunit
     publishers:
       - fundraising-crm-clean
       # Publish PHPUnit junit results
       - xunit:
          types:
           - phpunit:
              pattern: 'log/junit-phpunit.xml'
       - archive-log-dir
 
 - job:
     name: wikimedia-fundraising-civicrm-docker
     node: DebianJessieDocker && m4executor
     concurrent: true
     triggers:
         - zuul
     builders:
         - docker-log-dir
         - docker-src-dir
         - docker-zuul-cloner:
             projects: >
                 wikimedia/fundraising/crm
                 wikimedia/fundraising/crm/civicrm-buildkit
                 wikimedia/fundraising/crm/civicrm
                 wikimedia/fundraising/crm/drupal
         - docker-run-with-log-cache-src:
             image: docker-registry.wikimedia.org/releng/civicrm:0.1.0
             # $WORKSPACE is leaked from the host environment
             options: "--env WORKSPACE=''"
             logdir: /log
     publishers:
         - xunit:
            types:
             - phpunit:
                pattern: 'log/junit-phpunit.xml'
         - archive-log-allow-empty
         - docker-cleanup
 
 
 - project:
     name: donationinterface-fundraising-branches-php70
     branch:
      - REL1_31
     jobs:
      - quibble-donationinterface-{branch}-php70-docker
 
 - job-template:
     name: quibble-donationinterface-{branch}-php70-docker
     node: DebianJessieDocker && m4executor
     concurrent: true
     triggers:
         - zuul
     builders:
         - docker-castor-load
         - docker-log-dir
         - docker-run-with-log-and-workspace-cache:
             image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.31-5
             options: '--volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
             # With composer to get dependencies from DonationInterface. However we also clone mediawiki/vendor
             args: >
                 --packages-source composer --db mysql --db-dir /workspace/db --run=phpunit
                 --branch "{branch}"
                 --project-branch mediawiki/extensions/DonationInterface=master
                 --project-branch "mediawiki/core=fundraising/{branch}"
                 --project-branch "mediawiki/vendor=fundraising/{branch}"
                 mediawiki/vendor
                 mediawiki/extensions/DonationInterface
                 mediawiki/extensions/FundraisingEmailUnsubscribe
                 mediawiki/extensions/ContributionTracking
                 mediawiki/extensions/ParserFunctions
                 mediawiki/extensions/cldr
             logdir: '/workspace/log'
     publishers:
         - junit:
             results: 'log/junit*.xml'
         - archive-log-allow-empty
         - castor-save-workspace-cache
         - docker-cleanup
     wrappers:
         - timeout:
             timeout: 30
             fail: true
         - timestamps
         - ansicolor
 
-- project:
-    name: fundraising-dash
-    jobs:
-     - '{name}-npm-node-6-docker'
-
 - project:
     name: fundraising-tools
     jobs:
         - '{name}-tox-docker':
             docker_image_var: docker-registry.wikimedia.org/releng/tox-mysqld:0.4.0