diff --git a/cbuildbot/commands.py b/cbuildbot/commands.py
index 7910195..8d79417 100644
--- a/cbuildbot/commands.py
+++ b/cbuildbot/commands.py
@@ -1497,7 +1497,6 @@
       'hard_timeout_secs': swarming_timeout,
       'expiration_secs': _SWARMING_EXPIRATION,
       'tags': tags,
-      'service_account_json': constants.CHROMEOS_SERVICE_ACCOUNT,
   }
 
 
diff --git a/lib/constants.py b/lib/constants.py
index 7b38747..01ef0a2 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1262,15 +1262,3 @@
 # Mock build and stage IDs
 MOCK_STAGE_ID = 313377
 MOCK_BUILD_ID = 31337
-
-# Topology dictionary copied from CIDB.
-TOPOLOGY_DICT = {
-    '/buildbucket/host':'cr-buildbucket.appspot.com',
-    '/chrome_swarming_proxy/host':'chromeos-swarming.appspot.com',
-    '/datastore/creds_file':('/creds/service_accounts/service-account-chromeos'
-                             '-datastore-writer-prod.json'),
-    '/sheriffomatic/host':'sheriff-o-matic.appspot.com',
-    '/statsd/es_host':'104.154.79.237',
-    '/statsd/host':'104.154.79.237',
-    '/swarming_proxy/host':'chromeos-proxy.appspot.com',
-}