diff --git a/docs/core-api/FILES.md b/docs/core-api/FILES.md
index 9dc726d8ff..b2611a023e 100644
--- a/docs/core-api/FILES.md
+++ b/docs/core-api/FILES.md
@@ -143,7 +143,7 @@ One of `path` or `content` _must_ be passed.
 `FileContent` is one of the following types:
 
 ```js
-Uint8Array | Blob | String | Iterable<Uint8Array> | Iterable<number> | AsyncIterable<Uint8Array> | ReadableStream<Uint8Array>
+Uint8Array | Blob | String | Iterable<Uint8Array|Number> | AsyncIterable<Uint8Array> | ReadableStream<Uint8Array>
 ```
 
 `UnixTime` is one of the following types:
@@ -162,7 +162,7 @@ An optional object which may have the following keys:
 
 | Name | Type | Default | Description |
 | ---- | ---- | ------- | ----------- |
-| chunker | `String` | `'size-262144'` | chunking algorithm used to build ipfs DAGs |
+| chunker | `String` | `'size-262144` | chunking algorithm used to build ipfs DAGs |
 | cidVersion | `Number` | `0` | the CID version to use when storing the data |
 | hashAlg | `String` | `'sha2-256'` | multihash hashing algorithm to use |
 | onlyHash | `boolean` | `false` | If true, will not add blocks to the blockstore |
@@ -178,7 +178,7 @@ An optional object which may have the following keys:
 
 | Type | Description |
 | -------- | -------- |
-| `Promise<UnixFSEntry>` | A object describing the added data |
+| `UnixFSEntry` | A object describing the added data |
 
 Each yielded object is of the form:
 
@@ -226,7 +226,7 @@ Now [ipfs.io/ipfs/Qm..pg/myfile.txt](https://ipfs.io/ipfs/QmWXdjNC362aPDtwHPUE9o
 
 | Name | Type | Description |
 | ---- | ---- | ----------- |
-| source | [FileStream<FileContent\|FileObject>](#filestream) | Data to import (see below) |
+| source | [FileStream<FileContent|FileObject>](#filestream) | Data to import (see below) |
 
 ##### FileStream
 
@@ -242,7 +242,7 @@ An optional object which may have the following keys:
 
 | Name | Type | Default | Description |
 | ---- | ---- | ------- | ----------- |
-| chunker | `String` | `'size-262144'` | chunking algorithm used to build ipfs DAGs |
+| chunker | `String` | `'size-262144` | chunking algorithm used to build ipfs DAGs |
 | cidVersion | `Number` | `0` | the CID version to use when storing the data |
 | enableShardingExperiment | `boolean` | `false` |  allows to create directories with an unlimited number of entries currently size of unixfs directories is limited by the maximum block size. Note that this is an experimental feature |
 | hashAlg | `String` | `'sha2-256'` | multihash hashing algorithm to use |
diff --git a/docs/core-api/REPO.md b/docs/core-api/REPO.md
index a545c9a14e..ad79bf8484 100644
--- a/docs/core-api/REPO.md
+++ b/docs/core-api/REPO.md
@@ -68,7 +68,7 @@ An optional object which may have the following keys:
 
 | Name | Type | Default | Description |
 | ---- | ---- | ------- | ----------- |
-| human | `boolean` | `false` | Return storage numbers in `MiB` |
+| options | `boolean` | `false` | Return storage numbers in `MiB` |
 | timeout | `Number` | `undefined` | A timeout in ms |
 | signal | [AbortSignal][] | `undefined` |  Can be used to cancel any long running requests started as a result of this call |
 
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
index bf85308b42..06a29f0337 100644
--- a/packages/ipfs-http-client/package.json
+++ b/packages/ipfs-http-client/package.json
@@ -185,7 +185,6 @@
     "shunkin <hiyoko.san.ipod@gmail.com>",
     "victorbjelkholm <victorbjelkholm@gmail.com>",
     "Łukasz Magiera <magik6k@users.noreply.github.com>",
-    "Łukasz Magiera <magik6k@gmail.com>",
-    "Xmader <xmader@outlook.com>"
+    "Łukasz Magiera <magik6k@gmail.com>"
   ]
 }
diff --git a/packages/ipfs-http-client/src/add-all.js b/packages/ipfs-http-client/src/add-all.js
index 68088db5c0..de3483648d 100644
--- a/packages/ipfs-http-client/src/add-all.js
+++ b/packages/ipfs-http-client/src/add-all.js
@@ -6,14 +6,10 @@ const configure = require('./lib/configure')
 const multipartRequest = require('./lib/multipart-request')
 const toUrlSearchParams = require('./lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure((api) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../ipfs/src/core/components/add-all').AddAll<import('.').HttpOptions>}
-   */
-  async function * addAll (input, options = {}) {
+  return async function * addAll (input, options = {}) {
     const progressFn = options.progress
 
     // allow aborting requests on body errors
@@ -43,16 +39,8 @@ module.exports = configure((api) => {
       }
     }
   }
-  return addAll
 })
 
-/**
- * @typedef {import('../../ipfs/src/core/components/add-all').UnixFSEntry} UnixFSEntry
- */
-
-/**
- * @returns {UnixFSEntry}
- */
 function toCoreInterface ({ name, hash, size, mode, mtime, mtimeNsecs }) {
   const output = {
     path: name,
@@ -71,6 +59,5 @@ function toCoreInterface ({ name, hash, size, mode, mtime, mtimeNsecs }) {
     }
   }
 
-  // @ts-ignore
   return output
 }
diff --git a/packages/ipfs-http-client/src/add.js b/packages/ipfs-http-client/src/add.js
index 7770be5843..3190b9a7d9 100644
--- a/packages/ipfs-http-client/src/add.js
+++ b/packages/ipfs-http-client/src/add.js
@@ -4,26 +4,12 @@ const addAll = require('./add-all')
 const last = require('it-last')
 const configure = require('./lib/configure')
 
-/**
- * @typedef {import("./lib/core").ClientOptions} ClientOptions
- */
-
-// eslint-disable-next-line valid-jsdoc
-/**
- * @param {ClientOptions} options
- */
 module.exports = (options) => {
   const all = addAll(options)
 
   return configure(() => {
-    // eslint-disable-next-line valid-jsdoc
-    /**
-     * @type {import('../../ipfs/src/core/components/add').Add<import('.').HttpOptions>}
-     */
-    async function add (input, options = {}) { // eslint-disable-line require-await
-      // @ts-ignore
+    return async function add (input, options = {}) { // eslint-disable-line require-await
       return last(all(input, options))
     }
-    return add
   })(options)
 }
diff --git a/packages/ipfs-http-client/src/bitswap/stat.js b/packages/ipfs-http-client/src/bitswap/stat.js
index 8f1b64afad..ec27458969 100644
--- a/packages/ipfs-http-client/src/bitswap/stat.js
+++ b/packages/ipfs-http-client/src/bitswap/stat.js
@@ -6,11 +6,7 @@ const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../../ipfs/src/core/components/bitswap/stat').Stat<import('..').HttpOptions>}
-   */
-  async function stat (options = {}) {
+  return async (options = {}) => {
     const res = await api.post('bitswap/stat', {
       searchParams: toUrlSearchParams(options),
       timeout: options.timeout,
@@ -20,7 +16,6 @@ module.exports = configure(api => {
 
     return toCoreInterface(await res.json())
   }
-  return stat
 })
 
 function toCoreInterface (res) {
diff --git a/packages/ipfs-http-client/src/bitswap/unwant.js b/packages/ipfs-http-client/src/bitswap/unwant.js
index 602776e7c4..b9706cebc4 100644
--- a/packages/ipfs-http-client/src/bitswap/unwant.js
+++ b/packages/ipfs-http-client/src/bitswap/unwant.js
@@ -5,11 +5,7 @@ const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../../ipfs/src/core/components/bitswap/unwant').Unwant<import('..').HttpOptions>}
-   */
-  async function unwant (cid, options = {}) {
+  return async (cid, options = {}) => {
     const res = await api.post('bitswap/unwant', {
       timeout: options.timeout,
       signal: options.signal,
@@ -22,5 +18,4 @@ module.exports = configure(api => {
 
     return res.json()
   }
-  return unwant
 })
diff --git a/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js b/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
index 7d0599a380..b777ee7d6c 100644
--- a/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
+++ b/packages/ipfs-http-client/src/bitswap/wantlist-for-peer.js
@@ -5,11 +5,7 @@ const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../../ipfs/src/core/components/bitswap/wantlist-for-peer').WantlistForPeer<import('..').HttpOptions>}
-   */
-  async function wantlistForPeer (peerId, options = {}) {
+  return async (peerId, options = {}) => {
     peerId = typeof peerId === 'string' ? peerId : new CID(peerId).toString()
 
     const res = await (await api.post('bitswap/wantlist', {
@@ -24,5 +20,4 @@ module.exports = configure(api => {
 
     return (res.Keys || []).map(k => new CID(k['/']))
   }
-  return wantlistForPeer
 })
diff --git a/packages/ipfs-http-client/src/bitswap/wantlist.js b/packages/ipfs-http-client/src/bitswap/wantlist.js
index 96f33cad91..2599c7ed79 100644
--- a/packages/ipfs-http-client/src/bitswap/wantlist.js
+++ b/packages/ipfs-http-client/src/bitswap/wantlist.js
@@ -5,11 +5,7 @@ const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../../ipfs/src/core/components/bitswap/wantlist').WantlistFn<import('..').HttpOptions>}
-   */
-  async function wantlist (options = {}) {
+  return async (options = {}) => {
     const res = await (await api.post('bitswap/wantlist', {
       timeout: options.timeout,
       signal: options.signal,
@@ -19,5 +15,4 @@ module.exports = configure(api => {
 
     return (res.Keys || []).map(k => new CID(k['/']))
   }
-  return wantlist
 })
diff --git a/packages/ipfs-http-client/src/block/get.js b/packages/ipfs-http-client/src/block/get.js
index 18a1fdf3ac..f39aa6d96b 100644
--- a/packages/ipfs-http-client/src/block/get.js
+++ b/packages/ipfs-http-client/src/block/get.js
@@ -6,11 +6,7 @@ const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../../ipfs/src/core/components/block/get').BlockGet<import('..').HttpOptions>}
-   */
-  async function get (cid, options = {}) {
+  return async (cid, options = {}) => {
     cid = new CID(cid)
 
     const res = await api.post('block/get', {
@@ -25,5 +21,4 @@ module.exports = configure(api => {
 
     return new Block(new Uint8Array(await res.arrayBuffer()), cid)
   }
-  return get
 })
diff --git a/packages/ipfs-http-client/src/block/put.js b/packages/ipfs-http-client/src/block/put.js
index 5d3f62803a..09888a815e 100644
--- a/packages/ipfs-http-client/src/block/put.js
+++ b/packages/ipfs-http-client/src/block/put.js
@@ -7,13 +7,9 @@ const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../../ipfs/src/core/components/block/put').BlockPut<import('..').HttpOptions>}
-   */
   async function put (data, options = {}) {
     if (Block.isBlock(data)) {
       const { name, length } = multihash.decode(data.cid.multihash)
diff --git a/packages/ipfs-http-client/src/config/replace.js b/packages/ipfs-http-client/src/config/replace.js
index 33df9ed5a5..63ced0e20a 100644
--- a/packages/ipfs-http-client/src/config/replace.js
+++ b/packages/ipfs-http-client/src/config/replace.js
@@ -5,7 +5,7 @@ const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure(api => {
   return async (config, options = {}) => {
diff --git a/packages/ipfs-http-client/src/dag/put.js b/packages/ipfs-http-client/src/dag/put.js
index d0a395b435..e4f261c632 100644
--- a/packages/ipfs-http-client/src/dag/put.js
+++ b/packages/ipfs-http-client/src/dag/put.js
@@ -9,7 +9,7 @@ const configure = require('../lib/configure')
 const multipartRequest = require('../lib/multipart-request')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 const multicodec = require('multicodec')
 
 module.exports = configure((api, opts) => {
diff --git a/packages/ipfs-http-client/src/files/write.js b/packages/ipfs-http-client/src/files/write.js
index 0fcbbec808..c3e72c9bb3 100644
--- a/packages/ipfs-http-client/src/files/write.js
+++ b/packages/ipfs-http-client/src/files/write.js
@@ -6,7 +6,7 @@ const configure = require('../lib/configure')
 const multipartRequest = require('../lib/multipart-request')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure(api => {
   return async (path, input, options = {}) => {
diff --git a/packages/ipfs-http-client/src/id.js b/packages/ipfs-http-client/src/id.js
index a4e86eb022..e868460766 100644
--- a/packages/ipfs-http-client/src/id.js
+++ b/packages/ipfs-http-client/src/id.js
@@ -6,11 +6,7 @@ const configure = require('./lib/configure')
 const toUrlSearchParams = require('./lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../ipfs/src/core/components/id').Id<import('.').HttpOptions>}
-   */
-  async function id (options = {}) {
+  return async (options = {}) => {
     const res = await api.post('id', {
       timeout: options.timeout,
       signal: options.signal,
@@ -27,5 +23,4 @@ module.exports = configure(api => {
 
     return output
   }
-  return id
 })
diff --git a/packages/ipfs-http-client/src/index.js b/packages/ipfs-http-client/src/index.js
index acd27d14f8..3d0eeeedd0 100644
--- a/packages/ipfs-http-client/src/index.js
+++ b/packages/ipfs-http-client/src/index.js
@@ -14,17 +14,9 @@ const urlSource = require('ipfs-utils/src/files/url-source')
  */
 
 /**
- * @typedef {object} HttpOptions
- * @property {Headers | Record<string, string>} [headers] - An object or [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers) instance that can be used to set custom HTTP headers. Note that this option can also be [configured globally](#custom-headers) via the constructor options.
- * @property {URLSearchParams | Record<string, string>} [searchParams] - An object or [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) instance that can be used to add additional query parameters to the query string sent with each request.
- * @property {object} [ipld]
- * @property {any[]} [ipld.formats] - An array of additional [IPLD formats](https://github.com/ipld/interface-ipld-format) to support
- * @property {(format: string) => Promise<any>} [ipld.loadFormat] - an async function that takes the name of an [IPLD format](https://github.com/ipld/interface-ipld-format) as a string and should return the implementation of that codec
- */
-
-// eslint-disable-next-line valid-jsdoc
-/**
- * @param {ClientOptions} options
+ *
+ * @param {ClientOptions } options
+ * @return {Object}
  */
 function ipfsClient (options = {}) {
   return {
diff --git a/packages/ipfs-http-client/src/lib/configure.js b/packages/ipfs-http-client/src/lib/configure.js
index 6396c05d1d..49b2d2f5a3 100644
--- a/packages/ipfs-http-client/src/lib/configure.js
+++ b/packages/ipfs-http-client/src/lib/configure.js
@@ -9,19 +9,8 @@ const Client = require('./core')
  */
 
 /**
- * @template T
- * @typedef {(client: Client, clientOptions: ClientOptions) => T} Fn
- */
-
-/**
- * @template T
- * @typedef {(clientOptions: ClientOptions) => T} Factory
- */
-
-/**
- * @template T
- * @param {Fn<T>} fn
- * @returns {Factory<T>}
+ * @param {function(Client, ClientOptions): void} fn
+ * @returns {function(ClientOptions): void}
  */
 const configure = (fn) => {
   return (options) => {
diff --git a/packages/ipfs-http-client/src/lib/to-url-search-params.js b/packages/ipfs-http-client/src/lib/to-url-search-params.js
index 10f12d83d0..1e0bbeb4b9 100644
--- a/packages/ipfs-http-client/src/lib/to-url-search-params.js
+++ b/packages/ipfs-http-client/src/lib/to-url-search-params.js
@@ -3,10 +3,6 @@
 const modeToString = require('./mode-to-string')
 const mtimeToObject = require('./mtime-to-object')
 
-/**
- * @param {object} params
- * @returns {URLSearchParams}
- */
 module.exports = ({ arg, searchParams, hashAlg, mtime, mode, ...options } = {}) => {
   if (searchParams) {
     options = {
diff --git a/packages/ipfs-http-client/src/object/patch/append-data.js b/packages/ipfs-http-client/src/object/patch/append-data.js
index bb27ea8fce..c334907508 100644
--- a/packages/ipfs-http-client/src/object/patch/append-data.js
+++ b/packages/ipfs-http-client/src/object/patch/append-data.js
@@ -5,7 +5,7 @@ const multipartRequest = require('../../lib/multipart-request')
 const configure = require('../../lib/configure')
 const toUrlSearchParams = require('../../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure(api => {
   return async (cid, data, options = {}) => {
diff --git a/packages/ipfs-http-client/src/object/patch/set-data.js b/packages/ipfs-http-client/src/object/patch/set-data.js
index a2aa4180f1..59c3394b52 100644
--- a/packages/ipfs-http-client/src/object/patch/set-data.js
+++ b/packages/ipfs-http-client/src/object/patch/set-data.js
@@ -5,7 +5,7 @@ const multipartRequest = require('../../lib/multipart-request')
 const configure = require('../../lib/configure')
 const toUrlSearchParams = require('../../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure(api => {
   return async (cid, data, options = {}) => {
diff --git a/packages/ipfs-http-client/src/object/put.js b/packages/ipfs-http-client/src/object/put.js
index f5aa827cde..c9e46898a4 100644
--- a/packages/ipfs-http-client/src/object/put.js
+++ b/packages/ipfs-http-client/src/object/put.js
@@ -6,7 +6,7 @@ const multipartRequest = require('../lib/multipart-request')
 const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 const unit8ArrayToString = require('uint8arrays/to-string')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 
diff --git a/packages/ipfs-http-client/src/pubsub/publish.js b/packages/ipfs-http-client/src/pubsub/publish.js
index 9ec83bc691..0b24f4fc28 100644
--- a/packages/ipfs-http-client/src/pubsub/publish.js
+++ b/packages/ipfs-http-client/src/pubsub/publish.js
@@ -4,7 +4,7 @@ const configure = require('../lib/configure')
 const toUrlSearchParams = require('../lib/to-url-search-params')
 const multipartRequest = require('../lib/multipart-request')
 const anySignal = require('any-signal')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 module.exports = configure(api => {
   return async (topic, data, options = {}) => {
diff --git a/packages/ipfs-http-client/src/pubsub/subscription-tracker.js b/packages/ipfs-http-client/src/pubsub/subscription-tracker.js
index d5640bdd1a..191f832cec 100644
--- a/packages/ipfs-http-client/src/pubsub/subscription-tracker.js
+++ b/packages/ipfs-http-client/src/pubsub/subscription-tracker.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 
 class SubscriptionTracker {
   constructor () {
diff --git a/packages/ipfs-http-client/src/resolve.js b/packages/ipfs-http-client/src/resolve.js
index 1dbac9256e..a7635dad13 100644
--- a/packages/ipfs-http-client/src/resolve.js
+++ b/packages/ipfs-http-client/src/resolve.js
@@ -4,11 +4,7 @@ const configure = require('./lib/configure')
 const toUrlSearchParams = require('./lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../ipfs/src/core/components/resolve').Resolve<import('.').HttpOptions>}
-   */
-  async function resolve (path, options = {}) {
+  return async (path, options = {}) => {
     const res = await api.post('resolve', {
       timeout: options.timeout,
       signal: options.signal,
@@ -21,5 +17,4 @@ module.exports = configure(api => {
     const { Path } = await res.json()
     return Path
   }
-  return resolve
 })
diff --git a/packages/ipfs-http-client/src/version.js b/packages/ipfs-http-client/src/version.js
index 67d1ab314b..28c49101bd 100644
--- a/packages/ipfs-http-client/src/version.js
+++ b/packages/ipfs-http-client/src/version.js
@@ -5,11 +5,7 @@ const configure = require('./lib/configure')
 const toUrlSearchParams = require('./lib/to-url-search-params')
 
 module.exports = configure(api => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {import('../../ipfs/src/core/components/version').Version<import('.').HttpOptions>}
-   */
-  async function version (options = {}) {
+  return async (options = {}) => {
     const res = await api.post('version', {
       timeout: options.timeout,
       signal: options.signal,
@@ -20,5 +16,4 @@ module.exports = configure(api => {
 
     return toCamel(data)
   }
-  return version
 })
diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
index 9c09d3fbb3..e5d7c2a811 100644
--- a/packages/ipfs/package.json
+++ b/packages/ipfs/package.json
@@ -345,7 +345,6 @@
     "tcme <hi@this-connect.me>",
     "victorbjelkholm <victorbjelkholm@gmail.com>",
     "Łukasz Magiera <magik6k@users.noreply.github.com>",
-    "Максим Ильин <negamaxi@gmail.com>",
-    "Xmader <xmader@outlook.com>"
+    "Максим Ильин <negamaxi@gmail.com>"
   ]
 }
diff --git a/packages/ipfs/src/core/api-manager.js b/packages/ipfs/src/core/api-manager.js
index 30a2ea3ae6..5ccc055e98 100644
--- a/packages/ipfs/src/core/api-manager.js
+++ b/packages/ipfs/src/core/api-manager.js
@@ -1,22 +1,8 @@
 'use strict'
 
 module.exports = class ApiManager {
-  /**
-   * @callback UndefFn
-   * @param {PropertyKey} prop
-   */
-
-  /**
-   * @template API
-   * @typedef {{ cancel(): any; api: API; }} Updated
-   */
-
   constructor () {
     this._api = {}
-    /**
-     * @type {UndefFn}
-     * @returns {any}
-     */
     this._onUndef = () => undefined
     this.api = new Proxy(this._api, {
       get: (_, prop) => {
@@ -26,18 +12,12 @@ module.exports = class ApiManager {
     })
   }
 
-  /**
-   * @template A
-   * @param {A} nextApi
-   * @param {UndefFn} [onUndef]
-   * @returns {Updated<A>}
-   */
   update (nextApi, onUndef) {
     const prevApi = { ...this._api }
     const prevUndef = this._onUndef
     Object.keys(this._api).forEach(k => { delete this._api[k] })
-    const api = Object.assign(this._api, nextApi)
+    Object.assign(this._api, nextApi)
     if (onUndef) this._onUndef = onUndef
-    return { cancel: () => this.update(prevApi, prevUndef), api }
+    return { cancel: () => this.update(prevApi, prevUndef), api: this.api }
   }
 }
diff --git a/packages/ipfs/src/core/components/add-all/index.js b/packages/ipfs/src/core/components/add-all/index.js
index 02da2817c4..f72c337439 100644
--- a/packages/ipfs/src/core/components/add-all/index.js
+++ b/packages/ipfs/src/core/components/add-all/index.js
@@ -3,62 +3,13 @@
 const importer = require('ipfs-unixfs-importer')
 const normaliseAddInput = require('ipfs-core-utils/src/files/normalise-input')
 const { parseChunkerString } = require('./utils')
-const { pipe } = require('it-pipe')
+const pipe = require('it-pipe')
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {Uint8Array | Blob | String | Iterable<Uint8Array> | Iterable<number> | AsyncIterable<Uint8Array> | ReadableStream<Uint8Array>} FileContent
- *
- * @typedef {object} FileObject
- *  - If no path is specified, then the item will be added to the root level and will be given a name according to it's CID.
- *  - If no content is passed, then the item is treated as an empty directory.
- *  - One of path or content must be passed.
- * @property {string} [path] - The path you want to the file to be accessible at from the root CID _after_ it has been added
- * @property {FileContent} [content] - The contents of the file
- * @property {number | string} [mode] - File mode to store the entry with (see https://en.wikipedia.org/wiki/File_system_permissions#Numeric_notation)
- * @property {UnixTime} [mtime] - The modification time of the entry
- *
- * @typedef {FileContent | FileObject} Source
- * @typedef {Iterable<Source> | AsyncIterable<Source> | ReadableStream<Source>} FileStream
- *
- * @typedef {Date | UnixTimeObj | [number, number]} UnixTime - As an array of numbers, it must have two elements, as per the output of [`process.hrtime()`](https://nodejs.org/dist/latest/docs/api/process.html#process_process_hrtime_time).
- *
- * @typedef {object} UnixTimeObj
- * @property {number} secs - the number of seconds since (positive) or before (negative) the Unix Epoch began
- * @property {number} [nsecs] - the number of nanoseconds since the last full second.
- *
- * @typedef {object} UnixFSEntry
- * @property {string} path
- * @property {import('cids')} cid
- * @property {number} mode
- * @property {UnixTimeObj} mtime
- * @property {number} size
- */
-
-/**
- * @typedef {import('../add').AddOptions & _AddAllOptions} AddAllOptions
- * @typedef {object} _AddAllOptions
- * @property {boolean} [enableShardingExperiment] - allows to create directories with an unlimited number of entries currently size of unixfs directories is limited by the maximum block size. Note that this is an experimental feature (default: `false`)
- * @property {number} [shardSplitThreshold] - Directories with more than this number of files will be created as HAMT-sharded directories (default: `1000`)
- */
-
-/**
- * Import multiple files and data into IPFS.
- * @template {Record<string, any>} ExtraOptions
- * @callback AddAll
- * @param {FileStream} source
- * @param {AddAllOptions & import('../../utils').AbortOptions & ExtraOptions} [options]
- * @returns {AsyncIterable<UnixFSEntry>}
- */
-
 module.exports = ({ block, gcLock, preload, pin, options: constructorOptions }) => {
   const isShardingEnabled = constructorOptions.EXPERIMENTAL && constructorOptions.EXPERIMENTAL.sharding
 
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {AddAll<{}>}
-   */
-  async function * addAll (source, options) {
+  return withTimeoutOption(async function * addAll (source, options) {
     options = options || {}
 
     const opts = {
@@ -107,9 +58,7 @@ module.exports = ({ block, gcLock, preload, pin, options: constructorOptions })
     } finally {
       releaseLock()
     }
-  }
-
-  return withTimeoutOption(addAll)
+  })
 }
 
 function transformFile (opts) {
diff --git a/packages/ipfs/src/core/components/add.js b/packages/ipfs/src/core/components/add.js
index 21fc461cb0..89a240df63 100644
--- a/packages/ipfs/src/core/components/add.js
+++ b/packages/ipfs/src/core/components/add.js
@@ -2,40 +2,8 @@
 
 const last = require('it-last')
 
-/**
- * @typedef {import('./add-all').Source} Source
- * @typedef {import('./add-all').UnixFSEntry} UnixFSEntry
- */
-
-/**
- * @typedef {object} AddOptions
- * @property {string} [chunker] - chunking algorithm used to build ipfs DAGs (default: `'size-262144'`)
- * @property {number} [cidVersion] - the CID version to use when storing the data (default: `0`)
- * @property {string} [hashAlg] - multihash hashing algorithm to use (default: `'sha2-256'`)
- * @property {boolean} [onlyHash] - If true, will not add blocks to the blockstore (default: `false`)
- * @property {boolean} [pin] - pin this object when adding (default: `true`)
- * @property {function} [progress] - a function that will be called with the byte length of chunks as a file is added to ipfs (default: `undefined`)
- * @property {boolean} [rawLeaves] - if true, DAG leaves will contain raw file data and not be wrapped in a protobuf (default: `false`)
- * @property {boolean} [trickle] - if true will use the [trickle DAG](https://godoc.org/github.com/ipsn/go-ipfs/gxlibs/github.com/ipfs/go-unixfs/importer/trickle) format for DAG generation (default: `false`)
- * @property {boolean} [wrapWithDirectory] - Adds a wrapping node around the content (default: `false`)
- */
-
-/**
- * Import a file or data into IPFS.
- * @template {Record<string, any>} ExtraOptions
- * @callback Add
- * @param {Source} source - Data to import
- * @param {AddOptions & import('../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<UnixFSEntry>}
- */
-
 module.exports = ({ addAll }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {Add<{}>}
-   */
-  async function add (source, options) { // eslint-disable-line require-await
+  return async function add (source, options) { // eslint-disable-line require-await
     return last(addAll(source, options))
   }
-  return add
 }
diff --git a/packages/ipfs/src/core/components/bitswap/stat.js b/packages/ipfs/src/core/components/bitswap/stat.js
index 2b009d17fa..ac716029e8 100644
--- a/packages/ipfs/src/core/components/bitswap/stat.js
+++ b/packages/ipfs/src/core/components/bitswap/stat.js
@@ -1,36 +1,11 @@
 'use strict'
 
-const Big = require('bignumber.js').default
+const Big = require('bignumber.js')
 const CID = require('cids')
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {object} BitswapStats - An object that contains information about the bitswap agent
- * @property {number} provideBufLen - an integer
- * @property {import('cids')[]} wantlist
- * @property {string[]} peers - array of peer IDs as Strings
- * @property {Big} blocksReceived
- * @property {Big} dataReceived
- * @property {Big} blocksSent
- * @property {Big} dataSent
- * @property {Big} dupBlksReceived
- * @property {Big} dupDataReceived
- */
-
-/**
- * Show diagnostic information on the bitswap agent.
- * @template {Record<string, any>} ExtraOptions
- * @callback Stat
- * @param {import('../../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<BitswapStats>}
- */
-
 module.exports = ({ bitswap }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {Stat<{}>}
-   */
-  async function stat (options) { // eslint-disable-line require-await, @typescript-eslint/no-unused-vars
+  return withTimeoutOption(async function stat () { // eslint-disable-line require-await
     const snapshot = bitswap.stat().snapshot
 
     return {
@@ -44,7 +19,5 @@ module.exports = ({ bitswap }) => {
       blocksSent: new Big(snapshot.blocksSent),
       dataSent: new Big(snapshot.dataSent)
     }
-  }
-
-  return withTimeoutOption(stat)
+  })
 }
diff --git a/packages/ipfs/src/core/components/bitswap/unwant.js b/packages/ipfs/src/core/components/bitswap/unwant.js
index 8eadc17461..6845e85fd9 100644
--- a/packages/ipfs/src/core/components/bitswap/unwant.js
+++ b/packages/ipfs/src/core/components/bitswap/unwant.js
@@ -4,37 +4,18 @@ const CID = require('cids')
 const errCode = require('err-code')
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {import('cids')} CID
- */
-
-/**
- * Removes one or more CIDs from the wantlist
- * @template {Record<string, any>} ExtraOptions
- * @callback Unwant
- * @param {CID | CID[]} cids - The CIDs to remove from the wantlist
- * @param {import('../../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<void>} - A promise that resolves once the request is complete
- */
-
 module.exports = ({ bitswap }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {Unwant<{}>}
-   */
-  async function unwant (cids, options) { // eslint-disable-line require-await
-    if (!Array.isArray(cids)) {
-      cids = [cids]
+  return withTimeoutOption(async function unwant (keys, options) { // eslint-disable-line require-await
+    if (!Array.isArray(keys)) {
+      keys = [keys]
     }
 
     try {
-      cids = cids.map((cid) => new CID(cid))
+      keys = keys.map((key) => new CID(key))
     } catch (err) {
       throw errCode(err, 'ERR_INVALID_CID')
     }
 
-    return bitswap.unwant(cids, options)
-  }
-
-  return withTimeoutOption(unwant)
+    return bitswap.unwant(keys, options)
+  })
 }
diff --git a/packages/ipfs/src/core/components/bitswap/wantlist-for-peer.js b/packages/ipfs/src/core/components/bitswap/wantlist-for-peer.js
index 745c60bd15..4eb4092cd3 100644
--- a/packages/ipfs/src/core/components/bitswap/wantlist-for-peer.js
+++ b/packages/ipfs/src/core/components/bitswap/wantlist-for-peer.js
@@ -3,30 +3,10 @@
 const PeerId = require('peer-id')
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {import('cids')} CID
- * @typedef {import('peer-id')} PeerId
- */
-
-/**
- * Returns the wantlist for a connected peer
- * @template {Record<string, any>} ExtraOptions
- * @callback WantlistForPeer
- * @param {PeerId | CID | string | Buffer} peerId - A peer ID to return the wantlist for\
- * @param {import('../../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<CID[]>} - An array of CIDs currently in the wantlist
- */
-
 module.exports = ({ bitswap }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {WantlistForPeer<{}>}
-   */
-  async function wantlistForPeer (peerId, options = {}) { // eslint-disable-line require-await
+  return withTimeoutOption(async function wantlistForPeer (peerId, options = {}) { // eslint-disable-line require-await
     const list = bitswap.wantlistForPeer(PeerId.createFromCID(peerId), options)
 
     return Array.from(list).map(e => e[1].cid)
-  }
-
-  return withTimeoutOption(wantlistForPeer)
+  })
 }
diff --git a/packages/ipfs/src/core/components/bitswap/wantlist.js b/packages/ipfs/src/core/components/bitswap/wantlist.js
index 4347df7760..13930dd166 100644
--- a/packages/ipfs/src/core/components/bitswap/wantlist.js
+++ b/packages/ipfs/src/core/components/bitswap/wantlist.js
@@ -2,28 +2,10 @@
 
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {import('cids')} CID
- */
-
-/**
- * Returns the wantlist for your node
- * @template {Record<string, any>} ExtraOptions
- * @callback WantlistFn
- * @param {import('../../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<CID[]>} - An array of CIDs currently in the wantlist
- */
-
 module.exports = ({ bitswap }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {WantlistFn<{}>}
-   */
-  async function wantlist (options = {}) { // eslint-disable-line require-await
+  return withTimeoutOption(async function wantlist (options = {}) { // eslint-disable-line require-await
     const list = bitswap.getWantlist(options)
 
     return Array.from(list).map(e => e[1].cid)
-  }
-
-  return withTimeoutOption(wantlist)
+  })
 }
diff --git a/packages/ipfs/src/core/components/block/get.js b/packages/ipfs/src/core/components/block/get.js
index 5a2c12e879..48e17c9af6 100644
--- a/packages/ipfs/src/core/components/block/get.js
+++ b/packages/ipfs/src/core/components/block/get.js
@@ -3,31 +3,8 @@
 const { cleanCid } = require('./utils')
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {import('cids')} CID
- * @typedef {import('ipld-block')} Block
- */
-
-/**
- * @typedef {object} PreloadOptions
- * @property {boolean} [preload] - (default: `true`)
- */
-
-/**
- * Get a raw IPFS block.
- * @template {Record<string, any>} ExtraOptions
- * @callback BlockGet
- * @param {CID | string | Buffer} cid - A CID that corresponds to the desired block
- * @param {import('../../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<Block>} - A Block type object, containing both the data and the hash of the block
- */
-
 module.exports = ({ blockService, preload }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {BlockGet<PreloadOptions>}
-   */
-  async function get (cid, options) { // eslint-disable-line require-await
+  return withTimeoutOption(async function get (cid, options) { // eslint-disable-line require-await
     options = options || {}
     cid = cleanCid(cid)
 
@@ -36,7 +13,5 @@ module.exports = ({ blockService, preload }) => {
     }
 
     return blockService.get(cid, options)
-  }
-
-  return withTimeoutOption(get)
+  })
 }
diff --git a/packages/ipfs/src/core/components/block/put.js b/packages/ipfs/src/core/components/block/put.js
index 700b256730..6d41c7bdd4 100644
--- a/packages/ipfs/src/core/components/block/put.js
+++ b/packages/ipfs/src/core/components/block/put.js
@@ -6,37 +6,8 @@ const CID = require('cids')
 const isIPFS = require('is-ipfs')
 const { withTimeoutOption } = require('../../utils')
 
-/**
- * @typedef {import('cids')} CID
- * @typedef {import('ipld-block')} Block
- * @typedef {0 | 1} CidVersion
- */
-
-/**
- * @typedef {object} BlockPutOptions
- * @property {CID} [cid] - A CID to store the block under (default: `undefined`)
- * @property {string} [format] - The codec to use to create the CID (default: `'dag-pb'`)
- * @property {string} [mhtype] - The hashing algorithm to use to create the CID (default: `'sha2-256'`)
- * @property {number} [mhlen]
- * @property {CidVersion} [version] - The version to use to create the CID (default: `0`)
- * @property {boolean} [pin] - If true, pin added blocks recursively (default: `false`)
- */
-
-/**
- * Stores input as an IPFS block.
- * @template {Record<string, any>} ExtraOptions
- * @callback BlockPut
- * @param {Buffer | Block} block - The block or data to store
- * @param {BlockPutOptions & import('../../utils').AbortOptions & ExtraOptions} [options] - **Note:** If you pass a `Block` instance as the block parameter, you don't need to pass options, as the block instance will carry the CID value as a property.
- * @returns {Promise<Block>} - A Block type object, containing both the data and the hash of the block
- */
-
 module.exports = ({ blockService, pin, gcLock, preload }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {BlockPut<import('./get').PreloadOptions>}
-   */
-  async function put (block, options) {
+  return withTimeoutOption(async function put (block, options) {
     options = options || {}
 
     if (Array.isArray(block)) {
@@ -49,8 +20,6 @@ module.exports = ({ blockService, pin, gcLock, preload }) => {
       } else {
         const mhtype = options.mhtype || 'sha2-256'
         const format = options.format || 'dag-pb'
-
-        /** @type {CidVersion} */
         let cidVersion
 
         if (options.version == null) {
@@ -89,7 +58,5 @@ module.exports = ({ blockService, pin, gcLock, preload }) => {
     } finally {
       release()
     }
-  }
-
-  return withTimeoutOption(put)
+  })
 }
diff --git a/packages/ipfs/src/core/components/block/rm.js b/packages/ipfs/src/core/components/block/rm.js
index 1f7e1e6315..406529f9be 100644
--- a/packages/ipfs/src/core/components/block/rm.js
+++ b/packages/ipfs/src/core/components/block/rm.js
@@ -3,7 +3,7 @@
 const CID = require('cids')
 const errCode = require('err-code')
 const { parallelMap, filter } = require('streaming-iterables')
-const { pipe } = require('it-pipe')
+const pipe = require('it-pipe')
 const { PinTypes } = require('../pin/pin-manager')
 const { cleanCid } = require('./utils')
 const { withTimeoutOption } = require('../../utils')
diff --git a/packages/ipfs/src/core/components/files/chmod.js b/packages/ipfs/src/core/components/files/chmod.js
index c814b11f5c..ef9838acb9 100644
--- a/packages/ipfs/src/core/components/files/chmod.js
+++ b/packages/ipfs/src/core/components/files/chmod.js
@@ -12,7 +12,7 @@ const updateMfsRoot = require('./utils/update-mfs-root')
 const { DAGNode } = require('ipld-dag-pb')
 const mc = require('multicodec')
 const mh = require('multihashing-async').multihash
-const { pipe } = require('it-pipe')
+const pipe = require('it-pipe')
 const importer = require('ipfs-unixfs-importer')
 const exporter = require('ipfs-unixfs-exporter')
 const last = require('it-last')
diff --git a/packages/ipfs/src/core/components/id.js b/packages/ipfs/src/core/components/id.js
index bebdd86379..29dd07ff2d 100644
--- a/packages/ipfs/src/core/components/id.js
+++ b/packages/ipfs/src/core/components/id.js
@@ -5,30 +5,8 @@ const multiaddr = require('multiaddr')
 const { withTimeoutOption } = require('../utils')
 const uint8ArrayToString = require('uint8arrays/to-string')
 
-/**
- * @typedef {object} PeerIdObj - An object with the Peer identity
- * @property {string} id - the Peer ID
- * @property {string} publicKey - the public key of the peer as a base64 encoded string
- * @property {import('multiaddr')[]} addresses - A list of multiaddrs this node is listening on
- * @property {string} agentVersion - The agent version
- * @property {string} protocolVersion - The supported protocol version
- * @property {string[]} protocols - The supported protocols
- */
-
-/**
- * Returns the identity of the Peer
- * @template {Record<string, any>} ExtraOptions
- * @callback Id
- * @param {import('../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<PeerIdObj>}
- */
-
 module.exports = ({ peerId, libp2p }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {Id<{}>}
-   */
-  async function id (options) { // eslint-disable-line require-await, @typescript-eslint/no-unused-vars
+  return withTimeoutOption(async function id () { // eslint-disable-line require-await
     const id = peerId.toB58String()
     let addresses = []
     let protocols = []
@@ -60,6 +38,5 @@ module.exports = ({ peerId, libp2p }) => {
       protocolVersion: '9000',
       protocols: protocols.sort()
     }
-  }
-  return withTimeoutOption(id)
+  })
 }
diff --git a/packages/ipfs/src/core/components/index.js b/packages/ipfs/src/core/components/index.js
index 9911775886..8d2abb01b2 100644
--- a/packages/ipfs/src/core/components/index.js
+++ b/packages/ipfs/src/core/components/index.js
@@ -79,7 +79,8 @@ exports.pin = {
 }
 exports.ping = require('./ping')
 exports.pubsub = require('./pubsub')
-exports.refs = Object.assign(require('./refs'), { local: require('./refs/local') })
+exports.refs = require('./refs')
+exports.refs.local = require('./refs/local')
 exports.repo = {
   gc: require('./repo/gc'),
   stat: require('./repo/stat'),
diff --git a/packages/ipfs/src/core/components/init.js b/packages/ipfs/src/core/components/init.js
index d6963091a7..c5cd008fbb 100644
--- a/packages/ipfs/src/core/components/init.js
+++ b/packages/ipfs/src/core/components/init.js
@@ -170,14 +170,12 @@ module.exports = ({
     })
 
     apiManager.update(api, () => { throw new NotStartedError() })
-
-    /** @type {typeof api} */
-    const initializedApi = apiManager.api
-    return initializedApi
   } catch (err) {
     cancel()
     throw err
   }
+
+  return apiManager.api
 }
 
 async function initNewRepo (repo, { privateKey, emptyRepo, algorithm, bits, profiles, config, pass, print }) {
diff --git a/packages/ipfs/src/core/components/resolve.js b/packages/ipfs/src/core/components/resolve.js
index b56d381140..b55a375ec8 100644
--- a/packages/ipfs/src/core/components/resolve.js
+++ b/packages/ipfs/src/core/components/resolve.js
@@ -6,30 +6,21 @@ const { cidToString } = require('../../utils/cid')
 const { withTimeoutOption } = require('../utils')
 
 /**
- * @typedef {object} ResolveOptions
- * @property {string} [cidBase='base58btc'] - Multibase codec name the CID in the resolved path will be encoded with
- * @property {boolean} [recursive=true] - Resolve until the result is an IPFS name
- */
-
-/**
- * Resolve the value of names to IPFS
+ * @typedef {Object} ResolveOptions
+ * @prop {string} cidBase - Multibase codec name the CID in the resolved path will be encoded with
+ * @prop {boolean} [recursive=true] - Resolve until the result is an IPFS name
  *
- * There are a number of mutable name protocols that can link among themselves and into IPNS. For example IPNS references can (currently) point at an IPFS object, and DNS links can point at other DNS links, IPNS entries, or IPFS objects. This command accepts any of these identifiers and resolves them to the referenced item.
- *
- * @template {Record<string, any>} ExtraOptions
- * @callback Resolve
- * @param {string} path - The name to resolve
- * @param {ResolveOptions & import('../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<string>} - A string representing the resolved name
  */
 
+/** @typedef {(path: string, options?: ResolveOptions) => Promise<string>} Resolve */
+
 /**
  * IPFS Resolve factory
  *
- * @param {object} config
+ * @param {Object} config
  * @param {IPLD} config.ipld - An instance of IPLD
  * @param {NameApi} [config.name] - An IPFS core interface name API
- * @returns {Resolve<{}>}
+ * @returns {Resolve}
  */
 module.exports = ({ ipld, name }) => {
   return withTimeoutOption(async function resolve (path, opts) {
diff --git a/packages/ipfs/src/core/components/start.js b/packages/ipfs/src/core/components/start.js
index d0f6d2e553..b6d5fbbc6a 100644
--- a/packages/ipfs/src/core/components/start.js
+++ b/packages/ipfs/src/core/components/start.js
@@ -148,24 +148,16 @@ module.exports = ({
     })
 
     apiManager.update(api, () => undefined)
-
-    /** @type {typeof api} */
-    const startedApi = apiManager.api
-    startPromise.resolve(startedApi)
-    return startedApi
   } catch (err) {
     cancel()
     startPromise.reject(err)
     throw err
   }
+
+  startPromise.resolve(apiManager.api)
+  return apiManager.api
 })
 
-// eslint-disable-next-line valid-jsdoc
-/**
- * @template LIBP2P
- * @template BlockAPI, DagAPI, FilesAPI, PinAPI
- * @param {{ [x: string]: any; libp2p: LIBP2P; block: BlockAPI; dag: DagAPI; files: FilesAPI; pin: PinAPI; }} options
- */
 function createApi ({
   apiManager,
   bitswap,
@@ -235,10 +227,8 @@ function createApi ({
     resolve: Components.name.resolve({ dns, ipns, peerId, isOnline, options: constructorOptions })
   }
   const resolve = Components.resolve({ name, ipld })
-  const refs = Object.assign(
-    Components.refs({ ipld, resolve, preload }),
-    { local: Components.refs.local({ repo }) }
-  )
+  const refs = Components.refs({ ipld, resolve, preload })
+  refs.local = Components.refs.local({ repo })
 
   const pubsubNotEnabled = async () => { // eslint-disable-line require-await
     throw new NotEnabledError('pubsub not enabled')
diff --git a/packages/ipfs/src/core/components/stop.js b/packages/ipfs/src/core/components/stop.js
index ebe8494353..deefabbf9c 100644
--- a/packages/ipfs/src/core/components/stop.js
+++ b/packages/ipfs/src/core/components/stop.js
@@ -18,7 +18,7 @@ module.exports = ({
   libp2p,
   mfsPreload,
   peerId,
-  pinManager = {},
+  pinManager,
   preload,
   print,
   repo
@@ -120,10 +120,8 @@ function createApi ({
 
   const addAll = Components.addAll({ block, preload, pin, gcLock, options: constructorOptions })
   const resolve = Components.resolve({ ipld })
-  const refs = Object.assign(
-    Components.refs({ ipld, resolve, preload }),
-    { local: Components.refs.local({ repo }) }
-  )
+  const refs = Components.refs({ ipld, resolve, preload })
+  refs.local = Components.refs.local({ repo })
 
   const notStarted = async () => { // eslint-disable-line require-await
     throw new NotStartedError()
diff --git a/packages/ipfs/src/core/components/version.js b/packages/ipfs/src/core/components/version.js
index acffb6d727..77153e8541 100644
--- a/packages/ipfs/src/core/components/version.js
+++ b/packages/ipfs/src/core/components/version.js
@@ -3,29 +3,8 @@
 const pkg = require('../../../package.json')
 const { withTimeoutOption } = require('../utils')
 
-/**
- * @typedef {object} VersionObj - An object with the version of the implementation, the commit and the Repo. `js-ipfs` instances will also return the version of `interface-ipfs-core` and `ipfs-http-client` supported by this node
- * @property {string} version
- * @property {string} repo
- * @property {string} [commit]
- * @property {string} [interface-ipfs-core]
- * @property {string} [ipfs-http-client]
- */
-
-/**
- * Returns the implementation version
- * @template {Record<string, any>} ExtraOptions
- * @callback Version
- * @param {import('../utils').AbortOptions & ExtraOptions} [options]
- * @returns {Promise<VersionObj>}
- */
-
 module.exports = ({ repo }) => {
-  // eslint-disable-next-line valid-jsdoc
-  /**
-   * @type {Version<{}>}
-   */
-  async function version (options) {
+  return withTimeoutOption(async function version (options) {
     const repoVersion = await repo.version.get(options)
 
     return {
@@ -35,7 +14,5 @@ module.exports = ({ repo }) => {
       'interface-ipfs-core': pkg.devDependencies['interface-ipfs-core'],
       'ipfs-http-client': pkg.dependencies['ipfs-http-client']
     }
-  }
-
-  return withTimeoutOption(version)
+  })
 }
diff --git a/packages/ipfs/src/core/index.js b/packages/ipfs/src/core/index.js
index f111801e58..d13df9ed85 100644
--- a/packages/ipfs/src/core/index.js
+++ b/packages/ipfs/src/core/index.js
@@ -33,63 +33,6 @@ const getDefaultOptions = () => ({
   }
 })
 
-/**
- * @typedef {'rsa' | 'ed25519' | 'secp256k1'} KeyType
- *
- * @typedef {object} InitOptions
- * @property {boolean} [emptyRepo] - Whether to remove built-in assets, like the instructional tour and empty mutable file system, from the repo. (Default: `false`)
- * @property {KeyType} [algorithm] - The type of key to use. (Default: `rsa`)
- * @property {number} [bits] - Number of bits to use in the generated key pair (rsa only). (Default: `2048`)
- * @property {string | import('peer-id')} [privateKey] - A pre-generated private key to use. Can be either a base64 string or a [PeerId](https://github.com/libp2p/js-peer-id) instance. **NOTE: This overrides `bits`.**
- * @property {string} [pass] - A passphrase to encrypt keys. You should generally use the [top-level `pass` option](#optionspass) instead of the `init.pass` option (this one will take its value from the top-level option if not set).
- * @property {any[]} [profiles] - Apply profile settings to config.
- * @property {boolean} [allowNew] - Set to `false` to disallow initialization if the repo does not already exist. (Default: `true`)
- *
- * @typedef {object} RelayOptions
- * @property {boolean} [enabled] - Enable circuit relay dialer and listener. (Default: `true`)
- * @property {object} [hop]
- * @property {boolean=} [hop.enabled] - Make this node a relay (other nodes can connect *through* it). (Default: `false`)
- * @property {boolean=} [hop.active] - Make this an *active* relay node. Active relay nodes will attempt to dial a destination peer even if that peer is not yet connected to the relay. (Default: `false`)
- *
- * @typedef {object} PreloadOptions
- * @property {boolean} [enabled] - Enable content preloading (Default: `true`)
- * @property {string[]} [addresses] - Multiaddr API addresses of nodes that should preload content.
- *                                  - **NOTE:** nodes specified here should also be added to your node's bootstrap address list at `config.Boostrap`.
- *
- * @typedef {object} ExperimentalOptions
- * @property {boolean} [ipnsPubsub] - Enable pub-sub on IPNS. (Default: `false`)
- * @property {boolean} [sharding] - Enable directory sharding. Directories that have many child objects will be represented by multiple DAG nodes instead of just one. It can improve lookup performance when a directory has several thousand files or more. (Default: `false`)
- */
-
-/**
- * @typedef { import('ipfs-repo') } IpfsRepo
- */
-
-/**
- * Creates and returns a ready to use instance of an IPFS node.
- *
- * @template {boolean | InitOptions} INIT
- * @template {boolean} START
- *
- * @param {object} [options] - specify advanced configuration
- * @param {string | IpfsRepo} [options.repo] - The file path at which to store the IPFS node’s data. Alternatively, you can set up a customized storage system by providing an [`ipfs.Repo`](https://github.com/ipfs/js-ipfs-repo) instance. (Default: `'~/.jsipfs'` in Node.js, `'ipfs'` in browsers)
- * @param {boolean} [options.repoAutoMigrate] - `js-ipfs` comes bundled with a tool that automatically migrates your IPFS repository when a new version is available. (Default: `true`)
- * @param {INIT} [options.init] - Perform repo initialization steps when creating the IPFS node. (Default: `true`)
- *                              - Note that *initializing* a repo is different from creating an instance of [`ipfs.Repo`](https://github.com/ipfs/js-ipfs-repo). The IPFS constructor sets many special properties when initializing a repo, so you should usually not try and call `repoInstance.init()` yourself.
- * @param {START} [options.start] - If `false`, do not automatically start the IPFS node. Instead, you’ll need to manually call [`node.start()`](#nodestart) yourself. (Default: `true`)
- * @param {string} [options.pass] - A passphrase to encrypt/decrypt your keys. (Default: `null`)
- * @param {boolean} [options.silent] - Prevents all logging output from the IPFS node. (Default: `false`)
- * @param {RelayOptions} [options.relay] - Configure circuit relay (see the [circuit relay tutorial](https://github.com/ipfs/js-ipfs/tree/master/examples/circuit-relaying) to learn more). (Default: `{ enabled: true, hop: { enabled: false, active: false } }`)
- * @param {boolean} [options.offline] - Run ipfs node offline. The node does not connect to the rest of the network but provides a local API. (Default: `false`)
- * @param {PreloadOptions} [options.preload] - Configure remote preload nodes. The remote will preload content added on this node, and also attempt to preload objects requested by this node.
- * @param {ExperimentalOptions} [options.EXPERIMENTAL] - Enable and configure experimental features.
- * @param {object} [options.config] - Modify the default IPFS node config. This object will be *merged* with the default config; it will not replace it. (Default: [`config-nodejs.js`](https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs/src/core/runtime/config-nodejs.js) in Node.js, [`config-browser.js`](https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs/src/core/runtime/config-browser.js) in browsers)
- * @param {object} [options.ipld] - Modify the default IPLD config. This object will be *merged* with the default config; it will not replace it. Check IPLD [docs](https://github.com/ipld/js-ipld#ipld-constructor) for more information on the available options. (Default: [`ipld-nodejs.js`](https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs/src/core/runtime/ipld-nodejs.js) in Node.js, [`ipld-browser.js`](https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs/src/core/runtime/ipld-browser.js) in browsers)
- * @param {object | Function} [options.libp2p] - The libp2p option allows you to build your libp2p node by configuration, or via a bundle function. If you are looking to just modify the below options, using the object format is the quickest way to get the default features of libp2p. If you need to create a more customized libp2p node, such as with custom transports or peer/content routers that need some of the ipfs data on startup, a custom bundle is a great way to achieve this.
- *                                             - You can see the bundle in action in the [custom libp2p example](https://github.com/ipfs/js-ipfs/tree/master/examples/custom-libp2p).
- *                                             - Please see [libp2p/docs/CONFIGURATION.md](https://github.com/libp2p/js-libp2p/blob/master/doc/CONFIGURATION.md) for the list of options libp2p supports.
- *                                             - Default: [`libp2p-nodejs.js`](../src/core/runtime/libp2p-nodejs.js) in Node.js, [`libp2p-browser.js`](../src/core/runtime/libp2p-browser.js) in browsers
- */
 async function create (options) {
   options = mergeOptions(getDefaultOptions(), options)
 
@@ -101,21 +44,20 @@ async function create (options) {
   const { api } = apiManager.update({
     init: Components.init({ apiManager, print, options }),
     dns: Components.dns(),
-    isOnline: Components.isOnline({ libp2p: undefined })
+    isOnline: Components.isOnline({})
   }, async () => { throw new NotInitializedError() }) // eslint-disable-line require-await
 
-  const initializedApi = options.init && await api.init()
-  const startedApi = options.start && initializedApi && await initializedApi.start()
+  if (!options.init) {
+    return api
+  }
+
+  await api.init()
+
+  if (!options.start) {
+    return api
+  }
 
-  /**
-   * @template T, THEN, ELSE
-   * @typedef {NonNullable<T> extends false
-   *            ? THEN : ELSE } IsFalse
-   */
-  /** @type {IsFalse<INIT, typeof api, IsFalse<START, typeof initializedApi, typeof startedApi>>} */
-  // @ts-ignore
-  const ipfs = startedApi || initializedApi || api
-  return ipfs
+  return api.start()
 }
 
 module.exports = {
diff --git a/packages/ipfs/src/core/preload.js b/packages/ipfs/src/core/preload.js
index e763aa4d87..053103c648 100644
--- a/packages/ipfs/src/core/preload.js
+++ b/packages/ipfs/src/core/preload.js
@@ -4,13 +4,11 @@ const toUri = require('multiaddr-to-uri')
 const debug = require('debug')
 const CID = require('cids')
 const shuffle = require('array-shuffle')
-const { AbortController } = require('abort-controller')
+const AbortController = require('abort-controller')
 const preload = require('./runtime/preload-nodejs')
 
-const log = Object.assign(
-  debug('ipfs:preload'),
-  { error: debug('ipfs:preload:error') }
-)
+const log = debug('ipfs:preload')
+log.error = debug('ipfs:preload:error')
 
 module.exports = options => {
   options = options || {}
@@ -20,10 +18,9 @@ module.exports = options => {
   if (!options.enabled || !options.addresses.length) {
     log('preload disabled')
     const api = () => {}
-    return Object.assign(api, {
-      start: () => {},
-      stop: () => {}
-    })
+    api.start = () => {}
+    api.stop = () => {}
+    return api
   }
 
   let stopped = true
diff --git a/packages/ipfs/src/core/utils.js b/packages/ipfs/src/core/utils.js
index 1443ef67e7..2fd8594b37 100644
--- a/packages/ipfs/src/core/utils.js
+++ b/packages/ipfs/src/core/utils.js
@@ -127,28 +127,8 @@ const mapFile = (file, options) => {
   return output
 }
 
-/**
- * @template {any[]} ARGS
- * @template R
- * @typedef {(...args: ARGS) => R} Fn
- */
-
-/**
- * @typedef {object} AbortOptions
- * @property {number} [timeout] - A timeout in ms
- * @property {AbortSignal} [signal] - Can be used to cancel any long running requests started as a result of this call
- */
-
-/**
- * @template {any[]} ARGS
- * @template {Promise<any> | AsyncIterable} R - The return type of `fn`
- * @param {Fn<ARGS, R>} fn
- * @param {number} [optionsArgIndex]
- * @returns {Fn<ARGS, R>}
- */
 function withTimeoutOption (fn, optionsArgIndex) {
-  // eslint-disable-next-line valid-jsdoc
-  return /** @returns {R} */(/** @type {ARGS} */...args) => {
+  return (...args) => {
     const options = args[optionsArgIndex == null ? args.length - 1 : optionsArgIndex]
     if (!options || !options.timeout) return fn(...args)
 
@@ -186,7 +166,6 @@ function withTimeoutOption (fn, optionsArgIndex) {
     }
 
     if (fnRes[Symbol.asyncIterator]) {
-      // @ts-ignore
       return (async function * () {
         const it = fnRes[Symbol.asyncIterator]()
 
@@ -216,7 +195,6 @@ function withTimeoutOption (fn, optionsArgIndex) {
       })()
     }
 
-    // @ts-ignore
     return (async () => {
       try {
         const res = await Promise.race([fnRes, timeoutPromise])
diff --git a/packages/ipfs/src/index.js b/packages/ipfs/src/index.js
index cb336d3935..8140941bf4 100644
--- a/packages/ipfs/src/index.js
+++ b/packages/ipfs/src/index.js
@@ -2,9 +2,4 @@
 
 const IPFS = require('./core')
 
-/**
- * @typedef { ReturnType<typeof IPFS['create']> extends Promise<infer U>
- *             ? U : never } IPFS
- */
-
 module.exports = IPFS