diff --git a/package.json b/package.json
index a877dc10b9..a1a3b40fd4 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,6 @@
   "dependencies": {
     "@nodeutils/defaults-deep": "^1.1.0",
     "async": "^2.6.1",
-    "base32.js": "~0.1.0",
     "big.js": "^5.2.2",
     "binary-querystring": "~0.1.2",
     "bl": "^2.1.2",
diff --git a/src/core/components/pre-start.js b/src/core/components/pre-start.js
index 9914a8167e..13d914acc4 100644
--- a/src/core/components/pre-start.js
+++ b/src/core/components/pre-start.js
@@ -7,10 +7,6 @@ const waterfall = require('async/waterfall')
 const Keychain = require('libp2p-keychain')
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const NoKeychain = require('./no-keychain')
-
-const IPNS = require('../ipns')
-const OfflineDatastore = require('../ipns/routing/offline-datastore')
-
 /*
  * Load stuff from Repo into memory
  */
@@ -99,13 +95,6 @@ module.exports = function preStart (self) {
 
         cb()
       },
-      // Setup offline routing for IPNS.
-      (cb) => {
-        const offlineDatastore = new OfflineDatastore(self._repo)
-
-        self._ipns = new IPNS(offlineDatastore, self)
-        cb()
-      },
       (cb) => self.pin._load(cb)
     ], callback)
   }
diff --git a/src/core/ipns/routing/offline-datastore.js b/src/core/ipns/routing/offline-datastore.js
index bdfb67a63e..26de52528c 100644
--- a/src/core/ipns/routing/offline-datastore.js
+++ b/src/core/ipns/routing/offline-datastore.js
@@ -3,14 +3,11 @@
 const { Key } = require('interface-datastore')
 const { encodeBase32 } = require('./utils')
 
-<<<<<<< HEAD
 const errcode = require('err-code')
 const debug = require('debug')
 const log = debug('jsipfs:ipns:offline-datastore')
 log.error = debug('jsipfs:ipns:offline-datastore:error')
 
-=======
->>>>>>> refactor: ipns routing logic moved to instantiation
 // Offline datastore aims to mimic the same encoding as routing when storing records
 // to the local datastore
 class OfflineDatastore {