diff --git a/src/cli/commands/bitswap/unwant.js b/src/cli/commands/bitswap/unwant.js
index ede4230a2b..e09ea250cc 100644
--- a/src/cli/commands/bitswap/unwant.js
+++ b/src/cli/commands/bitswap/unwant.js
@@ -18,7 +18,7 @@ module.exports = Command.extend({
         throw err
       }
 
-      // TODO: implement
+      throw new Error('Not implemented yet')
     })
   }
 })
diff --git a/src/core/ipfs/go-offline.js b/src/core/ipfs/go-offline.js
index b20af41cad..e6afef8228 100644
--- a/src/core/ipfs/go-offline.js
+++ b/src/core/ipfs/go-offline.js
@@ -7,11 +7,6 @@ module.exports = function goOffline (self) {
   return (cb) => {
     self._blockS.goOffline()
     self._bitswap.stop()
-    self.libp2p.stop((err) => {
-      if (err) {
-        log('Error trying to go offline', err)
-      }
-      cb()
-    })
+    self.libp2p.stop(cb)
   }
 }
diff --git a/src/http-api/resources/bitswap.js b/src/http-api/resources/bitswap.js
index e384f9bffc..b4d941322d 100644
--- a/src/http-api/resources/bitswap.js
+++ b/src/http-api/resources/bitswap.js
@@ -41,9 +41,6 @@ exports.unwant = {
   parseArgs: parseKey,
 
   handler: (request, reply) => {
-    const key = request.pre.args.key
-
-    request.server.app.ipfs.bitswap.unwant(key)
-    reply()
+    reply(boom.badRequrest(new Error('Not implemented yet')))
   }
 }