--- a/taskcluster/docker/desktop-build/Dockerfile
+++ b/taskcluster/docker/desktop-build/Dockerfile
@@ -1,16 +1,15 @@
 # TODO remove VOLUME below when the base image is updated next.
 FROM          taskcluster/centos6-build-upd:0.1.8.20170808150401
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 VOLUME /builds/worker/workspace
 VOLUME /builds/worker/tooltool-cache
 VOLUME /builds/worker/checkouts
-VOLUME /builds/worker/.tc-vcs
 
 # Add build scripts; these are the entry points from the taskcluster worker, and
 # operate on environment variables
 ADD             bin /builds/worker/bin
 RUN             chmod +x /builds/worker/bin/*
 
 # %include python/mozbuild/mozbuild/action/tooltool.py
 ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /builds/tooltool.py

--- a/taskcluster/docker/desktop1604-test/Dockerfile
+++ b/taskcluster/docker/desktop1604-test/Dockerfile
@@ -57,30 +57,28 @@ ENV           LANG          en_US.UTF-8
 ENV           LC_ALL        en_US.UTF-8
 
 # Add utilities and configuration
 COPY           dot-files/config              /builds/worker/.config
 COPY           dot-files/pulse               /builds/worker/.pulse
 RUN            chmod +x bin/*
 # TODO: remove this when buildbot is gone
 COPY           buildprops.json               /builds/worker/buildprops.json
-COPY           tc-vcs-config.yml /etc/taskcluster-vcs.yml
 
 # TODO: remove
 ADD            https://raw.githubusercontent.com/taskcluster/buildbot-step/master/buildbot_step /builds/worker/bin/buildbot_step
 RUN chmod u+x /builds/worker/bin/buildbot_step
 
 # allow the worker user to access video devices
 RUN usermod -a -G video worker
 
 RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
 
-# install tc-vcs and tc-npm-cache
-RUN npm install -g taskcluster-vcs@2.3.12 \
- && npm install -g taskcluster-npm-cache@1.1.14 \
+# install tc-npm-cache
+RUN  npm install -g taskcluster-npm-cache@1.1.14 \
  && rm -rf ~/.npm
 ENV PATH $PATH:/builds/worker/bin
 
 # TODO Re-enable worker when bug 1093833 lands
 #USER          worker
 
 # Disable Ubuntu update prompt
 # http://askubuntu.com/questions/515161/ubuntu-12-04-disable-release-notification-of-14-04-in-update-manager

deleted file mode 100644
--- a/taskcluster/docker/desktop1604-test/tc-vcs-config.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Default configuration used by the tc-vs tools these can be overridden by
-# passing the config you wish to use over the command line...
-git: git
-hg: hg
-
-repoCache:
-  # Repo url to clone when running repo init..
-  repoUrl: https://gerrit.googlesource.com/git-repo.git
-  # Version of repo to utilize...
-  repoRevision: master
-  # The root where all downloaded cache files are stored on the local machine...
-  cacheDir: '{{env.HOME}}/.tc-vcs-repo/'
-  # Name/prefixed used as part of the base url.
-  cacheName: sources/{{name}}.tar.gz
-  # Command used to upload the tarball
-  uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"
-  # Large http get requests are often slower using nodes built in http layer so
-  # we utilize a subprocess which is responsible for fetching...
-  get: curl --connect-timeout 30 --speed-limit 500000 -L -o {{dest}} {{url}}
-  # Used to create clone tarball
-  compress: tar -czf {{dest}} {{source}}
-  # All cache urls use tar + gz this is the command used to extract those files
-  # downloaded by the "get" command.
-  extract: tar -x -z -C {{dest}} -f {{source}}
-
-cloneCache:
-  # The root where all downloaded cache files are stored on the local machine...
-  cacheDir: '{{env.HOME}}/.tc-vcs/'
-  # Command used to upload the tarball
-  uploadTar: "curl --header 'Content-Type: application/x-tar' --header 'Content-Encoding: gzip' -X PUT --data-binary @'{{source}}' '{{url}}'"
-  # Large http get requests are often slower using nodes built in http layer so
-  # we utilize a subprocess which is responsible for fetching...
-  get: curl --connect-timeout 30 --speed-limit 500000 -L -o {{dest}} {{url}}
-  # Used to create clone tarball
-  compress: tar -czf {{dest}} {{source}}
-  # All cache urls use tar + gz this is the command used to extract those files
-  # downloaded by the "get" command.
-  extract: tar -x -z --strip-components 1 -C {{dest}} -f {{source}}
-  # Name/prefixed used as part of the base url.
-  cacheName: clones/{{name}}.tar.gz