diff --git a/jest.config.js b/jest.config.js
index 5fccf5aee0..6e891d4b4f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,8 +2,6 @@ module.exports = {
   preset: 'ts-jest',
   testRegex: '((\\.|/)(e2e|test|spec))\\.[jt]sx?$',
   moduleNameMapper: {
-    // NOTE(canonbrother): uncomment it only while test running with this dependency
-    // '@defichain/jellyfish': '<rootDir>/packages/jellyfish/src/jellyfish/src',
     '@defichain/jellyfish-address': '<rootDir>/packages/jellyfish-address/src',
     '@defichain/jellyfish-api-core': '<rootDir>/packages/jellyfish-api-core/src',
     '@defichain/jellyfish-api-jsonrpc': '<rootDir>/packages/jellyfish-api-jsonrpc/src',
@@ -17,5 +15,9 @@ module.exports = {
     '@defichain/testcontainers': '<rootDir>/packages/testcontainers/src',
     '@defichain/testing': '<rootDir>/packages/testing/src'
   },
-  testTimeout: 240000
+  testTimeout: 240000,
+  coveragePathIgnorePatterns: [
+    '/node_modules/',
+    '.*/__tests__/.*'
+  ]
 }
diff --git a/package.json b/package.json
index d9ccc8c43a..53844d8fd6 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "node": ">=14.x"
   },
   "scripts": {
+    "clean": "rm -rf ./packages/**/dist && rm -rf ./packages/**/tsconfig.build.tsbuildinfo",
     "prepare": "husky install",
     "build": "lerna run build",
     "version": "lerna version $1 --yes --no-push --no-git-tag-version",
@@ -29,8 +30,7 @@
     "standard": "ts-standard --fix",
     "test": "jest --maxWorkers=100%",
     "test:ci": "jest --ci --coverage --forceExit --maxWorkers=4",
-    "all": "npm run build && npm run standard && npm run test",
-    "clean": "rm -rf ./packages/**/dist && rm -rf ./packages/**/tsconfig.build.tsbuildinfo"
+    "all": "npm run clean && npm run build && npm run standard && npm run test"
   },
   "devDependencies": {
     "@size-limit/preset-app": "^4.10.1",
diff --git a/packages/jellyfish-wallet-mnemonic/__tests__/mnemonic/bip32.test.ts b/packages/jellyfish-wallet-mnemonic/__tests__/mnemonic/bip32.test.ts
index eb0caa3786..14f64a97ec 100644
--- a/packages/jellyfish-wallet-mnemonic/__tests__/mnemonic/bip32.test.ts
+++ b/packages/jellyfish-wallet-mnemonic/__tests__/mnemonic/bip32.test.ts
@@ -1,7 +1,6 @@
 import { MnemonicHdNode, MnemonicHdNodeProvider, mnemonicToSeed, generateMnemonic } from '../../src'
 import BigNumber from 'bignumber.js'
-import { Transaction, Vout } from '@defichain/jellyfish-transaction'
-import { OP_CODES } from '@defichain/jellyfish-transaction/src/script'
+import { Transaction, Vout, OP_CODES } from '@defichain/jellyfish-transaction'
 import { HASH160 } from '@defichain/jellyfish-crypto'
 
 const regTestBip32Options = {
diff --git a/packages/jellyfish-wallet/src/wallet_account.ts b/packages/jellyfish-wallet/src/wallet_account.ts
index 4ff3a6ceba..4bc6a94250 100644
--- a/packages/jellyfish-wallet/src/wallet_account.ts
+++ b/packages/jellyfish-wallet/src/wallet_account.ts
@@ -1,5 +1,4 @@
-import { Script } from '@defichain/jellyfish-transaction'
-import { OP_CODES } from '@defichain/jellyfish-transaction/src/script'
+import { Script, OP_CODES } from '@defichain/jellyfish-transaction'
 import { WalletHdNode } from './wallet_hd_node'
 import { Bech32, HASH160 } from '@defichain/jellyfish-crypto'
 import { Network } from '@defichain/jellyfish-network'
diff --git a/packages/testing/src/poolpair.ts b/packages/testing/src/poolpair.ts
index 9f048539ca..f51ac95fe0 100644
--- a/packages/testing/src/poolpair.ts
+++ b/packages/testing/src/poolpair.ts
@@ -1,6 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
-import { CreatePoolPairUTXO } from '@defichain/jellyfish-api-core/src/category/poolpair'
+import { poolpair } from '@defichain/jellyfish-api-core'
 import { getNewAddress } from './wallet'
 
 /**
@@ -37,7 +37,7 @@ export interface CreatePoolPairOptions {
   commission?: number
   status?: boolean
   ownerAddress?: string
-  utxos?: CreatePoolPairUTXO[]
+  utxos?: poolpair.CreatePoolPairUTXO[]
 }
 
 /**
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 31104c668c..fc4a7c5185 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,4 +1,3 @@
-// tsconfig global project options - build or dev
 {
   "compilerOptions": {
     "lib": ["es2020"],
diff --git a/tsconfig.build.json b/tsconfig.build.json
index f14cbb0007..7d090a6dd6 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -1,19 +1,13 @@
-// Build (not dev) tsconfig
 {
   "extends": "./tsconfig.base.json",
-  // monorepo settings
   "compilerOptions": {
     "composite": true,
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,
   },
-
-  // Note(canonbrother): Intentionally blank to prevent output unnecessary files
   "files": [],
-
   "references": [
-    {"path": "./packages/jellyfish/tsconfig.build.json"},
     {"path": "./packages/jellyfish-address/tsconfig.build.json"},
     {"path": "./packages/jellyfish-api-core/tsconfig.build.json"},
     {"path": "./packages/jellyfish-api-jsonrpc/tsconfig.build.json"},
diff --git a/tsconfig.json b/tsconfig.json
index c8902d6b54..b91f334b8e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,21 +3,6 @@
   "compilerOptions": {
     "baseUrl": "./packages",
     "paths": {
-      "@defichain/jellyfish": ["jellyfish/src"],
-      "@defichain/jellyfish-address": ["jellyfish-address/src"],
-      "@defichain/jellyfish-api-core": ["jellyfish-api-core/src"],
-      "@defichain/jellyfish-api-jsonrpc": ["jellyfish-api-jsonrpc/src"],
-      "@defichain/jellyfish-crypto": ["jellyfish-crypto/src"],
-      "@defichain/jellyfish-json": ["jellyfish-json/src"],
-      "@defichain/jellyfish-network": ["jellyfish-network/src"],
-      "@defichain/jellyfish-transaction": ["jellyfish-transaction/src"],
-      "@defichain/jellyfish-transaction-builder": ["jellyfish-transaction-builder/src"],
-      "@defichain/jellyfish-wallet": ["jellyfish-wallet/src"],
-      "@defichain/jellyfish-wallet-mnemonic": ["jellyfish-wallet-mnemonic/src"],
-      "@defichain/testcontainers": ["testcontainers/src"],
-      "@defichain/testing": ["testing/src"],
-
-      "@defichain/jellyfish/*": ["jellyfish/src/*"],
       "@defichain/jellyfish-address/*": ["jellyfish-address/src/*"],
       "@defichain/jellyfish-api-core/*": ["jellyfish-api-core/src/*"],
       "@defichain/jellyfish-api-jsonrpc/*": ["jellyfish-api-jsonrpc/src/*"],