diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb42d981fc..cc70beab00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,15 @@
 
 ## master
 
+- **Important** Internally rxjs has been upgraded to the 7.0 version, affecting users of the `ApiRx` interface
+
 Changes:
 
 - Contract reads will now expose an additional `gasRequired` (total estimated)
 - Allow schedule derives to handle scheduler entries that cannot decode
 - Add missing historic `Heartbeat: HeartbeatTo244` mapping to Westend
 - Add `BlockNumberFor` type mapping
+- Update to latest `@polkadot/x-rxjs` with RxJs 7.2
 
 
 ## 4.17.1 Jul 5, 2021
diff --git a/package.json b/package.json
index a3e8f11c7c..b6cae22405 100644
--- a/package.json
+++ b/package.json
@@ -34,5 +34,5 @@
     "@types/jest": "^26.0.23",
     "copyfiles": "^2.4.1"
   },
-  "version": "4.17.2-7"
+  "version": "4.17.2-8"
 }
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 576c9f1d05..34c5af1cc3 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
@@ -20,9 +20,9 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/api": "4.17.2-7",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/x-rxjs": "^6.11.1"
+    "@polkadot/api": "4.17.2-8",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "rxjs": "^7.2.0"
   }
 }
diff --git a/packages/api-contract/src/base/Contract.ts b/packages/api-contract/src/base/Contract.ts
index d888bcd195..4aadc57cc8 100644
--- a/packages/api-contract/src/base/Contract.ts
+++ b/packages/api-contract/src/base/Contract.ts
@@ -9,11 +9,12 @@ import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/type
 import type { AbiMessage, ContractCallOutcome, ContractOptions, DecodedEvent } from '../types';
 import type { ContractCallResult, ContractCallSend, ContractQuery, ContractTx, MapMessageQuery, MapMessageTx } from './types';
 
+import { map } from 'rxjs';
+
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
 import { createTypeUnsafe } from '@polkadot/types';
 import { assert, BN, BN_HUNDRED, BN_ONE, BN_ZERO, bnToBn, isFunction, isUndefined, logger } from '@polkadot/util';
-import { map } from '@polkadot/x-rxjs/operators';
 
 import { Abi } from '../Abi';
 import { applyOnEvent, extractOptions, isOptions } from '../util';
diff --git a/packages/api-contract/src/base/types.ts b/packages/api-contract/src/base/types.ts
index 5cca978587..9963cbb855 100644
--- a/packages/api-contract/src/base/types.ts
+++ b/packages/api-contract/src/base/types.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
 import type { ApiTypes, ObsInnerType } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
 import type { CodecArg } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';
 
 export interface BlueprintDeploy<ApiType extends ApiTypes> {
diff --git a/packages/api-contract/src/packageInfo.ts b/packages/api-contract/src/packageInfo.ts
index 31a2cfa832..fff6eb4859 100644
--- a/packages/api-contract/src/packageInfo.ts
+++ b/packages/api-contract/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-contract', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/api-contract', version: '4.17.2-8' };
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 69141ffe80..e4a67e8a97 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
@@ -20,15 +20,15 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/api": "4.17.2-7",
-    "@polkadot/rpc-core": "4.17.2-7",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/util-crypto": "^6.11.1",
-    "@polkadot/x-rxjs": "^6.11.1"
+    "@polkadot/api": "4.17.2-8",
+    "@polkadot/rpc-core": "4.17.2-8",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "@polkadot/util-crypto": "^6.11.2-6",
+    "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.1",
-    "@polkadot/rpc-provider": "4.17.2-7"
+    "@polkadot/keyring": "^6.11.2-6",
+    "@polkadot/rpc-provider": "4.17.2-8"
   }
 }
diff --git a/packages/api-derive/src/accounts/accountId.ts b/packages/api-derive/src/accounts/accountId.ts
index 75d2bbcd91..74a1f40a60 100644
--- a/packages/api-derive/src/accounts/accountId.ts
+++ b/packages/api-derive/src/accounts/accountId.ts
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { map, of } from 'rxjs';
 
 import { assertReturn, isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/flags.ts b/packages/api-derive/src/accounts/flags.ts
index 94be8fea84..a60cd8b46b 100644
--- a/packages/api-derive/src/accounts/flags.ts
+++ b/packages/api-derive/src/accounts/flags.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { AccountId, Address, Balance } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveAccountFlags } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/idAndIndex.ts b/packages/api-derive/src/accounts/idAndIndex.ts
index c4f32f37af..afede1cd0f 100644
--- a/packages/api-derive/src/accounts/idAndIndex.ts
+++ b/packages/api-derive/src/accounts/idAndIndex.ts
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIdAndIndex } from '../types';
 
+import { map, of } from 'rxjs';
+
 import { isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/idToIndex.ts b/packages/api-derive/src/accounts/idToIndex.ts
index 79b581831e..16a3814a81 100644
--- a/packages/api-derive/src/accounts/idToIndex.ts
+++ b/packages/api-derive/src/accounts/idToIndex.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIndexes } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/identity.ts b/packages/api-derive/src/accounts/identity.ts
index 87a367cad0..18aac02b3e 100644
--- a/packages/api-derive/src/accounts/identity.ts
+++ b/packages/api-derive/src/accounts/identity.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Data, Option } from '@polkadot/types';
 import type { AccountId, IdentityInfoAdditional, Registration } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isHex, u8aToString } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/indexToId.ts b/packages/api-derive/src/accounts/indexToId.ts
index 544ab6fac0..4e7f8c5f59 100644
--- a/packages/api-derive/src/accounts/indexToId.ts
+++ b/packages/api-derive/src/accounts/indexToId.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/indexes.ts b/packages/api-derive/src/accounts/indexes.ts
index c0e079ab0e..58cd8a44f1 100644
--- a/packages/api-derive/src/accounts/indexes.ts
+++ b/packages/api-derive/src/accounts/indexes.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { AccountIndexes } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map, startWith } from '@polkadot/x-rxjs/operators';
+import { map, of, startWith } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/accounts/info.ts b/packages/api-derive/src/accounts/info.ts
index 922825c1b3..b348f1e1bd 100644
--- a/packages/api-derive/src/accounts/info.ts
+++ b/packages/api-derive/src/accounts/info.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option, u32 } from '@polkadot/types';
 import type { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveAccountInfo, DeriveAccountRegistration } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { u8aToString } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/balances/account.ts b/packages/api-derive/src/balances/account.ts
index 5eb3ab8763..ff6b2c831d 100644
--- a/packages/api-derive/src/balances/account.ts
+++ b/packages/api-derive/src/balances/account.ts
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { AccountData, AccountId, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount, DeriveBalancesAccountData } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { assert, isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/balances/all.ts b/packages/api-derive/src/balances/all.ts
index fe7fe1971a..e88103f2d7 100644
--- a/packages/api-derive/src/balances/all.ts
+++ b/packages/api-derive/src/balances/all.ts
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, AccountIndex, Address, Balance, BalanceLock, BalanceLockTo212, BlockNumber, VestingInfo, VestingSchedule } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount, DeriveBalancesAccountData, DeriveBalancesAll, DeriveBalancesAllAccountData } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { BN, bnMax, isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/balances/fees.ts b/packages/api-derive/src/balances/fees.ts
index b7cd88ad7d..d6cc421dcd 100644
--- a/packages/api-derive/src/balances/fees.ts
+++ b/packages/api-derive/src/balances/fees.ts
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Balance } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveFees } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/balances/votingBalances.ts b/packages/api-derive/src/balances/votingBalances.ts
index 87e3a70959..463bd876c6 100644
--- a/packages/api-derive/src/balances/votingBalances.ts
+++ b/packages/api-derive/src/balances/votingBalances.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
+import { combineLatest, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/bounties/bounties.spec.ts b/packages/api-derive/src/bounties/bounties.spec.ts
index a595abea2f..3f5d6940bf 100644
--- a/packages/api-derive/src/bounties/bounties.spec.ts
+++ b/packages/api-derive/src/bounties/bounties.spec.ts
@@ -6,10 +6,11 @@ import type { Bytes, Option, StorageKey } from '@polkadot/types';
 import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
 import type { Codec, InterfaceTypes } from '@polkadot/types/types';
 
+import { firstValueFrom, of } from 'rxjs';
+
 import { ApiPromise } from '@polkadot/api';
 import { DeriveCollectiveProposal } from '@polkadot/api-derive/types';
 import { Proposal } from '@polkadot/types/interfaces';
-import { of } from '@polkadot/x-rxjs';
 
 import { BountyFactory } from '../../test/bountyFactory';
 import { BytesFactory } from '../../test/bytesFactory';
@@ -98,7 +99,7 @@ describe('bounties derive', () => {
       }
     } as unknown as ApiInterfaceRx;
 
-    const result = await bounties('', mockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', mockApi)());
 
     expect(result).toHaveLength(2);
     expect(result[0].bounty.proposer.toString()).toEqual(DEFAULT_PROPOSER);
@@ -110,7 +111,7 @@ describe('bounties derive', () => {
   });
 
   it('returns motions', async () => {
-    const result = await bounties('', defaultMockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', defaultMockApi)());
 
     expect(result).toHaveLength(2);
     expect(result[0].proposals).toHaveLength(0);
@@ -126,7 +127,7 @@ describe('bounties derive', () => {
       }
     } as unknown as ApiInterfaceRx;
 
-    const result = await bounties('', mockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', mockApi)());
 
     expect(result).toHaveLength(2);
     expect(result[0].bounty.proposer.toString()).toEqual(DEFAULT_PROPOSER);
@@ -151,7 +152,7 @@ describe('bounties derive', () => {
       }
     } as unknown as ApiInterfaceRx;
 
-    const result = await bounties('', mockApi)().toPromise();
+    const result = await firstValueFrom(bounties('', mockApi)());
 
     expect(result).toHaveLength(2);
     expect(result[0].proposals).toHaveLength(0);
diff --git a/packages/api-derive/src/bounties/bounties.ts b/packages/api-derive/src/bounties/bounties.ts
index 2097b31b00..658d6aaa12 100644
--- a/packages/api-derive/src/bounties/bounties.ts
+++ b/packages/api-derive/src/bounties/bounties.ts
@@ -1,14 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { DeriveBounties, DeriveCollectiveProposal } from '@polkadot/api-derive/types';
 import type { Bytes, Option } from '@polkadot/types';
 import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { memo } from '@polkadot/api-derive/util';
-import { combineLatest, Observable, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { filterBountiesProposals } from './helpers/filterBountyProposals';
 
diff --git a/packages/api-derive/src/chain/bestNumber.ts b/packages/api-derive/src/chain/bestNumber.ts
index 5df2654c0f..20201fed5b 100644
--- a/packages/api-derive/src/chain/bestNumber.ts
+++ b/packages/api-derive/src/chain/bestNumber.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/chain/bestNumberFinalized.ts b/packages/api-derive/src/chain/bestNumberFinalized.ts
index 7212f32925..76aee7b617 100644
--- a/packages/api-derive/src/chain/bestNumberFinalized.ts
+++ b/packages/api-derive/src/chain/bestNumberFinalized.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/chain/bestNumberLag.ts b/packages/api-derive/src/chain/bestNumberLag.ts
index f71a2be6cc..b57aef5ac4 100644
--- a/packages/api-derive/src/chain/bestNumberLag.ts
+++ b/packages/api-derive/src/chain/bestNumberLag.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { combineLatest } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/chain/getBlock.ts b/packages/api-derive/src/chain/getBlock.ts
index 0e29727fda..11345cee7b 100644
--- a/packages/api-derive/src/chain/getBlock.ts
+++ b/packages/api-derive/src/chain/getBlock.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { SignedBlockExtended } from '../type/types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map } from '@polkadot/x-rxjs/operators';
+import { catchError, combineLatest, map, of } from 'rxjs';
 
 import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/chain/getHeader.ts b/packages/api-derive/src/chain/getHeader.ts
index 65e56f9dc0..6a0f16ae64 100644
--- a/packages/api-derive/src/chain/getHeader.ts
+++ b/packages/api-derive/src/chain/getHeader.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { HeaderExtended } from '../type/types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map } from '@polkadot/x-rxjs/operators';
+import { catchError, combineLatest, map, of } from 'rxjs';
 
 import { createHeaderExtended } from '../type';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/chain/subscribeNewBlocks.ts b/packages/api-derive/src/chain/subscribeNewBlocks.ts
index b4959eb71f..f7002d4003 100644
--- a/packages/api-derive/src/chain/subscribeNewBlocks.ts
+++ b/packages/api-derive/src/chain/subscribeNewBlocks.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { HeaderExtended, SignedBlockExtended } from '../type/types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { createSignedBlockExtended } from '../type';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/chain/subscribeNewHeads.ts b/packages/api-derive/src/chain/subscribeNewHeads.ts
index 4699de5d7f..4b1778c6f6 100644
--- a/packages/api-derive/src/chain/subscribeNewHeads.ts
+++ b/packages/api-derive/src/chain/subscribeNewHeads.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { HeaderExtended } from '../type/types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';
 
 import { createHeaderExtended } from '../type';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/collective/members.ts b/packages/api-derive/src/collective/members.ts
index 616065abaf..a77a62e911 100644
--- a/packages/api-derive/src/collective/members.ts
+++ b/packages/api-derive/src/collective/members.ts
@@ -1,13 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { Collective } from './types';
 
+import { of } from 'rxjs';
+
 import { isFunction } from '@polkadot/util';
-import { of } from '@polkadot/x-rxjs';
 
 import { memo } from '../util';
 import { getInstance } from './getInstance';
diff --git a/packages/api-derive/src/collective/prime.ts b/packages/api-derive/src/collective/prime.ts
index 1ff38089b9..d5caeddd76 100644
--- a/packages/api-derive/src/collective/prime.ts
+++ b/packages/api-derive/src/collective/prime.ts
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { map, of } from 'rxjs';
 
 import { isFunction } from '@polkadot/util';
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 import { getInstance } from './getInstance';
diff --git a/packages/api-derive/src/collective/proposals.ts b/packages/api-derive/src/collective/proposals.ts
index a0c7658438..1fbe334f7c 100644
--- a/packages/api-derive/src/collective/proposals.ts
+++ b/packages/api-derive/src/collective/proposals.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u32 } from '@polkadot/types';
 import type { Hash, Proposal, Votes } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal } from '../types';
 import type { Collective } from './types';
 
+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 import { getInstance } from './getInstance';
@@ -40,6 +40,9 @@ function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: strin
         // however we have had cases on Edgeware where the indices have moved around after an
         // upgrade, which results in invalid on-chain data
         combineLatest(hashes.map((hash) =>
+          // this should simply be api.query[section].proposalOf.multi<Option<Proposal>>(hashes),
+          // however we have had cases on Edgeware where the indices have moved around after an
+          // upgrade, which results in invalid on-chain data
           api.query[section].proposalOf<Option<Proposal>>(hash).pipe(
             catchError(() => of(null))
           )
diff --git a/packages/api-derive/src/contracts/fees.ts b/packages/api-derive/src/contracts/fees.ts
index b7b8586d40..f3da3b7e68 100644
--- a/packages/api-derive/src/contracts/fees.ts
+++ b/packages/api-derive/src/contracts/fees.ts
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveContractFees } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/council/members.ts b/packages/api-derive/src/council/members.ts
index 2a8e7d7856..0203c75c16 100644
--- a/packages/api-derive/src/council/members.ts
+++ b/packages/api-derive/src/council/members.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { members as collectiveMembers } from '../collective';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/council/prime.ts b/packages/api-derive/src/council/prime.ts
index b13348bfe1..e5f2883cb9 100644
--- a/packages/api-derive/src/council/prime.ts
+++ b/packages/api-derive/src/council/prime.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { prime as collectivePrime } from '../collective';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/council/proposals.ts b/packages/api-derive/src/council/proposals.ts
index 9c46ae42fa..4fa72a0387 100644
--- a/packages/api-derive/src/council/proposals.ts
+++ b/packages/api-derive/src/council/proposals.ts
@@ -1,10 +1,10 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { u32 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal } from '../types';
 
 import { hasProposals as collectiveHasProposals, proposal as collectiveProposal, proposalCount as collectiveProposalCount, proposalHashes as collectiveProposalHashes, proposals as collectiveProposals } from '../collective';
diff --git a/packages/api-derive/src/council/votes.ts b/packages/api-derive/src/council/votes.ts
index 930e89d610..8d58d472af 100644
--- a/packages/api-derive/src/council/votes.ts
+++ b/packages/api-derive/src/council/votes.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableModuleStorage } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { AccountId, Balance, Voter } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCouncilVote, DeriveCouncilVotes } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/council/votesOf.ts b/packages/api-derive/src/council/votesOf.ts
index 0de4eddf7e..b006211520 100644
--- a/packages/api-derive/src/council/votesOf.ts
+++ b/packages/api-derive/src/council/votesOf.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCouncilVote } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/dispatchQueue.ts b/packages/api-derive/src/democracy/dispatchQueue.ts
index cfebdf6e29..5c7b40cab6 100644
--- a/packages/api-derive/src/democracy/dispatchQueue.ts
+++ b/packages/api-derive/src/democracy/dispatchQueue.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u64, Vec } from '@polkadot/types';
 import type { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveDispatch, DeriveProposalImage } from '../types';
 
+import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction, stringToHex } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { catchError, map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/locks.ts b/packages/api-derive/src/democracy/locks.ts
index 44f0cf11f0..accf4d7501 100644
--- a/packages/api-derive/src/democracy/locks.ts
+++ b/packages/api-derive/src/democracy/locks.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveDemocracyLock } from '../types';
 
+import { map, of, switchMap } from 'rxjs';
+
 import { BN_ZERO, isUndefined } from '@polkadot/util';
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/nextExternal.ts b/packages/api-derive/src/democracy/nextExternal.ts
index 18be26f375..3f7083d85a 100644
--- a/packages/api-derive/src/democracy/nextExternal.ts
+++ b/packages/api-derive/src/democracy/nextExternal.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { Hash, VoteThreshold } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposalExternal } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/preimage.ts b/packages/api-derive/src/democracy/preimage.ts
index 3e88122cd3..f65e76c92d 100644
--- a/packages/api-derive/src/democracy/preimage.ts
+++ b/packages/api-derive/src/democracy/preimage.ts
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposalImage } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 import { parseImage } from './util';
diff --git a/packages/api-derive/src/democracy/preimages.ts b/packages/api-derive/src/democracy/preimages.ts
index e97c81e80c..8a417817f1 100644
--- a/packages/api-derive/src/democracy/preimages.ts
+++ b/packages/api-derive/src/democracy/preimages.ts
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposalImage } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 import { parseImage } from './util';
diff --git a/packages/api-derive/src/democracy/proposals.ts b/packages/api-derive/src/democracy/proposals.ts
index 7518a9f807..4f979f399f 100644
--- a/packages/api-derive/src/democracy/proposals.ts
+++ b/packages/api-derive/src/democracy/proposals.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, Balance, Hash, PropIndex } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveProposal, DeriveProposalImage } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/referendumIds.ts b/packages/api-derive/src/democracy/referendumIds.ts
index 7bedec303b..0a528debe8 100644
--- a/packages/api-derive/src/democracy/referendumIds.ts
+++ b/packages/api-derive/src/democracy/referendumIds.ts
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { ReferendumIndex } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/referendums.ts b/packages/api-derive/src/democracy/referendums.ts
index 6099904eae..367c50ee16 100644
--- a/packages/api-derive/src/democracy/referendums.ts
+++ b/packages/api-derive/src/democracy/referendums.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveReferendumExt } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/referendumsActive.ts b/packages/api-derive/src/democracy/referendumsActive.ts
index 63e4e5e2b4..1b19f24d63 100644
--- a/packages/api-derive/src/democracy/referendumsActive.ts
+++ b/packages/api-derive/src/democracy/referendumsActive.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveReferendum } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { switchMap } from '@polkadot/x-rxjs/operators';
+import { of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/referendumsFinished.ts b/packages/api-derive/src/democracy/referendumsFinished.ts
index ae95530750..2fb3bcde07 100644
--- a/packages/api-derive/src/democracy/referendumsFinished.ts
+++ b/packages/api-derive/src/democracy/referendumsFinished.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { ReferendumInfo, ReferendumInfoFinished } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/democracy/referendumsInfo.ts b/packages/api-derive/src/democracy/referendumsInfo.ts
index b2d6d7aa55..9a7363bc2a 100644
--- a/packages/api-derive/src/democracy/referendumsInfo.ts
+++ b/packages/api-derive/src/democracy/referendumsInfo.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDelegating, VotingDirectVote } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { isFunction } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 import { calcVotes, getStatus, parseImage } from './util';
diff --git a/packages/api-derive/src/democracy/sqrtElectorate.ts b/packages/api-derive/src/democracy/sqrtElectorate.ts
index c2cc3e8e12..80175e8cce 100644
--- a/packages/api-derive/src/democracy/sqrtElectorate.ts
+++ b/packages/api-derive/src/democracy/sqrtElectorate.ts
@@ -1,12 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { map } from 'rxjs';
 
 import { bnSqrt } from '@polkadot/util';
-import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/elections/info.ts b/packages/api-derive/src/elections/info.ts
index 02833e2177..72f85af756 100644
--- a/packages/api-derive/src/elections/info.ts
+++ b/packages/api-derive/src/elections/info.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { u32, Vec } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber, SeatHolder } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveElectionsInfo } from './types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/imOnline/receivedHeartbeats.ts b/packages/api-derive/src/imOnline/receivedHeartbeats.ts
index d2b2b20ff0..62bd5c2cfc 100644
--- a/packages/api-derive/src/imOnline/receivedHeartbeats.ts
+++ b/packages/api-derive/src/imOnline/receivedHeartbeats.ts
@@ -1,15 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option, u32 } from '@polkadot/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveHeartbeats } from '../types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { BN_ZERO } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/index.spec.ts b/packages/api-derive/src/index.spec.ts
index 5a85becbbc..5d03f82fc3 100644
--- a/packages/api-derive/src/index.spec.ts
+++ b/packages/api-derive/src/index.spec.ts
@@ -5,10 +5,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 
+import { from, Observable } from 'rxjs';
+
 import { ApiRx } from '@polkadot/api/rx';
 import { MockProvider } from '@polkadot/rpc-provider/mock';
 import { TypeRegistry } from '@polkadot/types/create';
-import { from, Observable } from '@polkadot/x-rxjs';
 
 import { ExactDerive } from '.';
 
diff --git a/packages/api-derive/src/index.ts b/packages/api-derive/src/index.ts
index 267281818f..d39658366c 100644
--- a/packages/api-derive/src/index.ts
+++ b/packages/api-derive/src/index.ts
@@ -3,9 +3,9 @@
 
 import './detectPackage';
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AnyFunction } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import * as accounts from './accounts';
 import * as balances from './balances';
diff --git a/packages/api-derive/src/membership/members.ts b/packages/api-derive/src/membership/members.ts
index 381f2371b0..eb0969bcb1 100644
--- a/packages/api-derive/src/membership/members.ts
+++ b/packages/api-derive/src/membership/members.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { members as collectiveMembers } from '../collective';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/membership/prime.ts b/packages/api-derive/src/membership/prime.ts
index 35ddf58050..469baf6508 100644
--- a/packages/api-derive/src/membership/prime.ts
+++ b/packages/api-derive/src/membership/prime.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { prime as collectivePrime } from '../collective';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/membership/proposals.ts b/packages/api-derive/src/membership/proposals.ts
index 29c967e0b0..0720bac6f2 100644
--- a/packages/api-derive/src/membership/proposals.ts
+++ b/packages/api-derive/src/membership/proposals.ts
@@ -1,10 +1,10 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { u32 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal } from '../types';
 
 import { hasProposals as collectiveHasProposals, proposal as collectiveProposal, proposalCount as collectiveProposalCount, proposalHashes as collectiveProposalHashes, proposals as collectiveProposals } from '../collective';
diff --git a/packages/api-derive/src/packageInfo.ts b/packages/api-derive/src/packageInfo.ts
index 6e0770650c..c19521e33f 100644
--- a/packages/api-derive/src/packageInfo.ts
+++ b/packages/api-derive/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api-derive', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/api-derive', version: '4.17.2-8' };
diff --git a/packages/api-derive/src/parachains/info.ts b/packages/api-derive/src/parachains/info.ts
index f87de4cff5..528367ac46 100644
--- a/packages/api-derive/src/parachains/info.ts
+++ b/packages/api-derive/src/parachains/info.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { CollatorId, ParaId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveParachainActive, DeriveParachainFull, DeriveParachainInfo } from '../types';
 import type { Active, DidUpdate, Heads, ParaInfoResult, PendingSwap, RelayDispatchQueue, RetryQueue, SelectedThreads } from './types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 import { didUpdateToBool } from './util';
diff --git a/packages/api-derive/src/parachains/overview.ts b/packages/api-derive/src/parachains/overview.ts
index b89f9d8c89..4ceb3c3606 100644
--- a/packages/api-derive/src/parachains/overview.ts
+++ b/packages/api-derive/src/parachains/overview.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { ParaId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveParachain, DeriveParachainInfo } from '../types';
 import type { DidUpdate, ParaInfoResult, PendingSwap, RelayDispatchQueueSize } from './types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 import { didUpdateToBool } from './util';
diff --git a/packages/api-derive/src/session/eraLength.ts b/packages/api-derive/src/session/eraLength.ts
index 0433265e56..a3a8c4b39b 100644
--- a/packages/api-derive/src/session/eraLength.ts
+++ b/packages/api-derive/src/session/eraLength.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/session/eraProgress.ts b/packages/api-derive/src/session/eraProgress.ts
index 80d2b60e72..9f0952ed2a 100644
--- a/packages/api-derive/src/session/eraProgress.ts
+++ b/packages/api-derive/src/session/eraProgress.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/session/indexes.ts b/packages/api-derive/src/session/indexes.ts
index 8deb0d4ab5..7c0e3a2fa3 100644
--- a/packages/api-derive/src/session/indexes.ts
+++ b/packages/api-derive/src/session/indexes.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u32 } from '@polkadot/types';
 import type { ActiveEraInfo, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSessionIndexes } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/session/info.ts b/packages/api-derive/src/session/info.ts
index b53fab93c6..6b0e3bc24a 100644
--- a/packages/api-derive/src/session/info.ts
+++ b/packages/api-derive/src/session/info.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSessionInfo } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/session/progress.ts b/packages/api-derive/src/session/progress.ts
index 542a609da0..6cec2d4c13 100644
--- a/packages/api-derive/src/session/progress.ts
+++ b/packages/api-derive/src/session/progress.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u64 } from '@polkadot/types';
 import type { SessionIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSessionInfo, DeriveSessionProgress } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/session/sessionProgress.ts b/packages/api-derive/src/session/sessionProgress.ts
index 0979987635..295ecdb234 100644
--- a/packages/api-derive/src/session/sessionProgress.ts
+++ b/packages/api-derive/src/session/sessionProgress.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/society/candidates.ts b/packages/api-derive/src/society/candidates.ts
index 13c63cbada..f392b71e40 100644
--- a/packages/api-derive/src/society/candidates.ts
+++ b/packages/api-derive/src/society/candidates.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, BalanceOf, Bid, BidKind } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSocietyCandidate } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/society/info.ts b/packages/api-derive/src/society/info.ts
index 31660c8087..229eec3b43 100644
--- a/packages/api-derive/src/society/info.ts
+++ b/packages/api-derive/src/society/info.ts
@@ -1,13 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u32, Vec } from '@polkadot/types';
 import type { AccountId, BalanceOf, Bid } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSociety } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/society/member.ts b/packages/api-derive/src/society/member.ts
index af6c60e9d0..f3f0f698e2 100644
--- a/packages/api-derive/src/society/member.ts
+++ b/packages/api-derive/src/society/member.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSocietyMember } from '../types';
 
-import { map } from '@polkadot/x-rxjs/operators';
+import { map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/society/members.ts b/packages/api-derive/src/society/members.ts
index a510109810..633d5a252d 100644
--- a/packages/api-derive/src/society/members.ts
+++ b/packages/api-derive/src/society/members.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { bool, Option, Vec } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveSocietyMember } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/account.ts b/packages/api-derive/src/staking/account.ts
index 435e1b84a0..9dc1c1316e 100644
--- a/packages/api-derive/src/staking/account.ts
+++ b/packages/api-derive/src/staking/account.ts
@@ -1,13 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Balance, StakingLedger, UnlockChunk } from '@polkadot/types/interfaces';
 import type { DeriveSessionInfo, DeriveStakingAccount, DeriveStakingKeys, DeriveStakingQuery, DeriveUnlocking } from '../types';
 
+import { combineLatest, map, switchMap } from 'rxjs';
+
 import { BN, BN_ZERO } from '@polkadot/util';
-import { combineLatest, Observable } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/currentPoints.ts b/packages/api-derive/src/staking/currentPoints.ts
index b93bff8b1d..d6be53bfb4 100644
--- a/packages/api-derive/src/staking/currentPoints.ts
+++ b/packages/api-derive/src/staking/currentPoints.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraRewardPoints } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { switchMap } from '@polkadot/x-rxjs/operators';
+import { switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/electedInfo.ts b/packages/api-derive/src/staking/electedInfo.ts
index 37797bc367..6e1fb4cdb4 100644
--- a/packages/api-derive/src/staking/electedInfo.ts
+++ b/packages/api-derive/src/staking/electedInfo.ts
@@ -1,13 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakingElected, StakingQueryFlags } from '../types';
 
+import { map, switchMap } from 'rxjs';
+
 import { arrayFlatten } from '@polkadot/util';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/erasExposure.ts b/packages/api-derive/src/staking/erasExposure.ts
index 654048e165..c3eacdf52d 100644
--- a/packages/api-derive/src/staking/erasExposure.ts
+++ b/packages/api-derive/src/staking/erasExposure.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { StorageKey } from '@polkadot/types';
 import type { AccountId, EraIndex, Exposure } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraExposure, DeriveEraNominatorExposure, DeriveEraValidatorExposure } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { deriveCache, memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/erasHistoric.ts b/packages/api-derive/src/staking/erasHistoric.ts
index cbbb074bf6..7553f5ef71 100644
--- a/packages/api-derive/src/staking/erasHistoric.ts
+++ b/packages/api-derive/src/staking/erasHistoric.ts
@@ -1,14 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, u32 } from '@polkadot/types';
 import type { ActiveEraInfo, EraIndex } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { map } from 'rxjs';
 
 import { BN_ONE, BN_ZERO } from '@polkadot/util';
-import { map } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/erasPoints.ts b/packages/api-derive/src/staking/erasPoints.ts
index a82a5207f8..428d3845c6 100644
--- a/packages/api-derive/src/staking/erasPoints.ts
+++ b/packages/api-derive/src/staking/erasPoints.ts
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraIndex, EraRewardPoints } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraPoints, DeriveEraValPoints } from '../types';
 
+import { map, of, switchMap } from 'rxjs';
+
 import { BN_ZERO } from '@polkadot/util';
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { deriveCache, memo } from '../util';
 import { filterEras } from './util';
diff --git a/packages/api-derive/src/staking/erasPrefs.ts b/packages/api-derive/src/staking/erasPrefs.ts
index b6eb237993..0a00a8f9e2 100644
--- a/packages/api-derive/src/staking/erasPrefs.ts
+++ b/packages/api-derive/src/staking/erasPrefs.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { StorageKey } from '@polkadot/types';
 import type { EraIndex, ValidatorPrefs } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraPrefs, DeriveEraValPrefs } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { deriveCache, memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/erasRewards.ts b/packages/api-derive/src/staking/erasRewards.ts
index 444a53dfde..804494def6 100644
--- a/packages/api-derive/src/staking/erasRewards.ts
+++ b/packages/api-derive/src/staking/erasRewards.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { Balance, EraIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraRewards } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, of, switchMap } from 'rxjs';
 
 import { deriveCache, memo } from '../util';
 import { filterEras } from './util';
diff --git a/packages/api-derive/src/staking/erasSlashes.ts b/packages/api-derive/src/staking/erasSlashes.ts
index 18f834d398..a74e4b0822 100644
--- a/packages/api-derive/src/staking/erasSlashes.ts
+++ b/packages/api-derive/src/staking/erasSlashes.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, StorageKey } from '@polkadot/types';
 import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraSlashes, DeriveEraValSlash } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { deriveCache, memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/keys.ts b/packages/api-derive/src/staking/keys.ts
index ee2b7588a1..41aec5c545 100644
--- a/packages/api-derive/src/staking/keys.ts
+++ b/packages/api-derive/src/staking/keys.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, Keys } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakingKeys } from './types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/overview.ts b/packages/api-derive/src/staking/overview.ts
index ddede94cc4..5d4f90418a 100644
--- a/packages/api-derive/src/staking/overview.ts
+++ b/packages/api-derive/src/staking/overview.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakingOverview } from '../types';
 
-import { combineLatest } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/ownExposure.ts b/packages/api-derive/src/staking/ownExposure.ts
index 912947e361..d9f1200407 100644
--- a/packages/api-derive/src/staking/ownExposure.ts
+++ b/packages/api-derive/src/staking/ownExposure.ts
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveOwnExposure } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/ownSlashes.ts b/packages/api-derive/src/staking/ownSlashes.ts
index e8904c09b7..9812151c86 100644
--- a/packages/api-derive/src/staking/ownSlashes.ts
+++ b/packages/api-derive/src/staking/ownSlashes.ts
@@ -1,15 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx, QueryableStorageMultiArg } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { BalanceOf, EraIndex, Perbill } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakerSlashes } from '../types';
 
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/query.ts b/packages/api-derive/src/staking/query.ts
index 32a2f60130..75dfc91224 100644
--- a/packages/api-derive/src/staking/query.ts
+++ b/packages/api-derive/src/staking/query.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId, EraIndex, Exposure, Nominations, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakingQuery, StakingQueryFlags } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/stakerExposure.ts b/packages/api-derive/src/staking/stakerExposure.ts
index 82160937c6..d049b48fe6 100644
--- a/packages/api-derive/src/staking/stakerExposure.ts
+++ b/packages/api-derive/src/staking/stakerExposure.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraValidatorExposure, DeriveStakerExposure } from '../types';
 
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/stakerPoints.ts b/packages/api-derive/src/staking/stakerPoints.ts
index 4fdd97e917..b559407aa0 100644
--- a/packages/api-derive/src/staking/stakerPoints.ts
+++ b/packages/api-derive/src/staking/stakerPoints.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakerPoints } from '../types';
 
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/stakerPrefs.ts b/packages/api-derive/src/staking/stakerPrefs.ts
index 67886ca601..9ffeea6c69 100644
--- a/packages/api-derive/src/staking/stakerPrefs.ts
+++ b/packages/api-derive/src/staking/stakerPrefs.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraIndex, ValidatorPrefs } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakerPrefs } from '../types';
 
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/stakerRewards.ts b/packages/api-derive/src/staking/stakerRewards.ts
index 18b6b8ab4c..aeee76c25e 100644
--- a/packages/api-derive/src/staking/stakerRewards.ts
+++ b/packages/api-derive/src/staking/stakerRewards.ts
@@ -1,16 +1,16 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, EraIndex, StakingLedger } from '@polkadot/types/interfaces';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveEraPoints, DeriveEraPrefs, DeriveEraRewards, DeriveEraValPrefs, DeriveStakerExposure, DeriveStakerReward, DeriveStakerRewardValidator } from '../types';
 import type { DeriveStakingQuery } from './types';
 
+import { combineLatest, map, of, switchMap } from 'rxjs';
+
 import { BN_BILLION, BN_ZERO } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/stakerSlashes.ts b/packages/api-derive/src/staking/stakerSlashes.ts
index 97af835ce0..0a7fd2ca8e 100644
--- a/packages/api-derive/src/staking/stakerSlashes.ts
+++ b/packages/api-derive/src/staking/stakerSlashes.ts
@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraIndex } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakerSlashes } from '../types';
 
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/stashes.ts b/packages/api-derive/src/staking/stashes.ts
index c788b2e881..a08c15c5d7 100644
--- a/packages/api-derive/src/staking/stashes.ts
+++ b/packages/api-derive/src/staking/stashes.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { map, startWith, switchMap } from '@polkadot/x-rxjs/operators';
+import { map, startWith, switchMap } from 'rxjs';
 
 import { drr, memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/validators.ts b/packages/api-derive/src/staking/validators.ts
index fd3c801534..eddae637bb 100644
--- a/packages/api-derive/src/staking/validators.ts
+++ b/packages/api-derive/src/staking/validators.ts
@@ -1,13 +1,12 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakingValidators } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/staking/waitingInfo.ts b/packages/api-derive/src/staking/waitingInfo.ts
index 81cf517263..cb677dc4a8 100644
--- a/packages/api-derive/src/staking/waitingInfo.ts
+++ b/packages/api-derive/src/staking/waitingInfo.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveStakingWaiting, StakingQueryFlags } from '../types';
 
-import { combineLatest } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/technicalCommittee/members.ts b/packages/api-derive/src/technicalCommittee/members.ts
index 0309a02feb..5e414ca78d 100644
--- a/packages/api-derive/src/technicalCommittee/members.ts
+++ b/packages/api-derive/src/technicalCommittee/members.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { members as collectiveMembers } from '../collective';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/technicalCommittee/prime.ts b/packages/api-derive/src/technicalCommittee/prime.ts
index 2e3cdaa4c6..2be869feac 100644
--- a/packages/api-derive/src/technicalCommittee/prime.ts
+++ b/packages/api-derive/src/technicalCommittee/prime.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { prime as collectivePrime } from '../collective';
 import { memo } from '../util';
diff --git a/packages/api-derive/src/technicalCommittee/proposals.ts b/packages/api-derive/src/technicalCommittee/proposals.ts
index cf7f389541..9f81a33c54 100644
--- a/packages/api-derive/src/technicalCommittee/proposals.ts
+++ b/packages/api-derive/src/technicalCommittee/proposals.ts
@@ -1,10 +1,10 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { u32 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal } from '../types';
 
 import { hasProposals as collectiveHasProposals, proposal as collectiveProposal, proposalCount as collectiveProposalCount, proposalHashes as collectiveProposalHashes, proposals as collectiveProposals } from '../collective';
diff --git a/packages/api-derive/src/treasury/proposals.ts b/packages/api-derive/src/treasury/proposals.ts
index 4fd30a4a98..a34721b69a 100644
--- a/packages/api-derive/src/treasury/proposals.ts
+++ b/packages/api-derive/src/treasury/proposals.ts
@@ -1,14 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { ProposalIndex, TreasuryProposal } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { DeriveCollectiveProposal, DeriveTreasuryProposal, DeriveTreasuryProposals } from '../types';
 
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/tx/events.ts b/packages/api-derive/src/tx/events.ts
index a6621a5693..7a468ff433 100644
--- a/packages/api-derive/src/tx/events.ts
+++ b/packages/api-derive/src/tx/events.ts
@@ -1,12 +1,11 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EventRecord, Hash, SignedBlock } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
-import { combineLatest } from '@polkadot/x-rxjs';
-import { map } from '@polkadot/x-rxjs/operators';
+import { combineLatest, map } from 'rxjs';
 
 import { memo } from '../util';
 
diff --git a/packages/api-derive/src/tx/signingInfo.ts b/packages/api-derive/src/tx/signingInfo.ts
index b88906c918..f643af5978 100644
--- a/packages/api-derive/src/tx/signingInfo.ts
+++ b/packages/api-derive/src/tx/signingInfo.ts
@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Header, Index } from '@polkadot/types/interfaces';
 import type { AnyNumber, Codec, IExtrinsicEra } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { isNumber, isUndefined } from '@polkadot/util';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { FALLBACK_MAX_HASH_COUNT, FALLBACK_PERIOD, MAX_FINALITY_LAG, MORTAL_PERIOD } from './constants';
 
diff --git a/packages/api-derive/src/util/memo.ts b/packages/api-derive/src/util/memo.ts
index 7237928ce2..68b98838b0 100644
--- a/packages/api-derive/src/util/memo.ts
+++ b/packages/api-derive/src/util/memo.ts
@@ -1,12 +1,13 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observer, TeardownLogic } from 'rxjs';
 import type { Memoized } from '@polkadot/util/types';
-import type { Observer, TeardownLogic } from '@polkadot/x-rxjs';
+
+import { Observable } from 'rxjs';
 
 import { drr } from '@polkadot/rpc-core/util';
 import { memoize } from '@polkadot/util';
-import { Observable } from '@polkadot/x-rxjs';
 
 type ObsFn <T> = (...params: any[]) => Observable<T>;
 
diff --git a/packages/api/package.json b/packages/api/package.json
index e00314eb8e..a61fd8245a 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
@@ -20,16 +20,16 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/api-derive": "4.17.2-7",
-    "@polkadot/keyring": "^6.11.1",
-    "@polkadot/metadata": "4.17.2-7",
-    "@polkadot/rpc-core": "4.17.2-7",
-    "@polkadot/rpc-provider": "4.17.2-7",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/types-known": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/util-crypto": "^6.11.1",
-    "@polkadot/x-rxjs": "^6.11.1",
-    "eventemitter3": "^4.0.7"
+    "@polkadot/api-derive": "4.17.2-8",
+    "@polkadot/keyring": "^6.11.2-6",
+    "@polkadot/metadata": "4.17.2-8",
+    "@polkadot/rpc-core": "4.17.2-8",
+    "@polkadot/rpc-provider": "4.17.2-8",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/types-known": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "@polkadot/util-crypto": "^6.11.2-6",
+    "eventemitter3": "^4.0.7",
+    "rxjs": "^7.2.0"
   }
 }
diff --git a/packages/api/src/base/Decorate.ts b/packages/api/src/base/Decorate.ts
index 9212c540e7..207607508d 100644
--- a/packages/api/src/base/Decorate.ts
+++ b/packages/api/src/base/Decorate.ts
@@ -1,6 +1,7 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { DecoratedMeta } from '@polkadot/metadata/decorate/types';
 import type { RpcInterface } from '@polkadot/rpc-core/types';
 import type { Option, Raw, StorageKey, Text, u64 } from '@polkadot/types';
@@ -11,6 +12,8 @@ import type { SubmittableExtrinsic } from '../submittable/types';
 import type { ApiDecoration, ApiInterfaceRx, ApiOptions, ApiTypes, DecoratedErrors, DecoratedEvents, DecoratedRpc, DecoratedRpcSection, DecorateMethod, PaginationOptions, QueryableConsts, QueryableModuleStorage, QueryableModuleStorageAt, QueryableStorage, QueryableStorageAt, QueryableStorageEntry, QueryableStorageEntryAt, QueryableStorageMulti, QueryableStorageMultiArg, SubmittableExtrinsicFunction, SubmittableExtrinsics, SubmittableModuleExtrinsics } from '../types';
 import type { VersionedRegistry } from './types';
 
+import { BehaviorSubject, combineLatest, map, of, switchMap, tap, toArray } from 'rxjs';
+
 import { decorateDerive, ExactDerive } from '@polkadot/api-derive';
 import { memo } from '@polkadot/api-derive/util';
 import { expandMetadata, Metadata } from '@polkadot/metadata';
@@ -20,8 +23,6 @@ import { TypeRegistry } from '@polkadot/types/create';
 import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/extrinsic/constants';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 import { arrayChunk, arrayFlatten, assert, BN, BN_ZERO, compactStripLength, logger, u8aToHex } from '@polkadot/util';
-import { BehaviorSubject, combineLatest, Observable, of } from '@polkadot/x-rxjs';
-import { map, switchMap, tap, toArray } from '@polkadot/x-rxjs/operators';
 
 import { createSubmittable } from '../submittable';
 import { augmentObject } from '../util/augmentObject';
diff --git a/packages/api/src/base/Init.ts b/packages/api/src/base/Init.ts
index b3fd6be38e..e6a1d303e2 100644
--- a/packages/api/src/base/Init.ts
+++ b/packages/api/src/base/Init.ts
@@ -1,22 +1,22 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable, Subscription } from 'rxjs';
 import type { RpcInterfaceMethod } from '@polkadot/rpc-core/types';
 import type { Text } from '@polkadot/types';
 import type { ChainProperties, Hash, RuntimeVersion } from '@polkadot/types/interfaces';
 import type { Registry } from '@polkadot/types/types';
 import type { BN } from '@polkadot/util';
-import type { Observable, Subscription } from '@polkadot/x-rxjs';
 import type { ApiBase, ApiDecoration, ApiOptions, ApiTypes, DecorateMethod } from '../types';
 import type { VersionedRegistry } from './types';
 
+import { firstValueFrom, map, of, switchMap } from 'rxjs';
+
 import { Metadata } from '@polkadot/metadata';
 import { TypeRegistry } from '@polkadot/types/create';
 import { getSpecAlias, getSpecExtensions, getSpecHasher, getSpecRpc, getSpecTypes, getUpgradeVersion } from '@polkadot/types-known';
 import { assert, BN_ZERO, logger, stringify, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
-import { of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 import { detectedCapabilities } from './capabilities';
 import { Decorate } from './Decorate';
@@ -140,7 +140,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     const header = this.registry.createType('HeaderPartial',
       this._genesisHash.eq(blockHash)
         ? { number: BN_ZERO, parentHash: this._genesisHash }
-        : await (this._rpcCore.chain.getHeader as RpcInterfaceMethod).json(blockHash).toPromise()
+        : await firstValueFrom((this._rpcCore.chain.getHeader as RpcInterfaceMethod).json(blockHash))
     );
 
     assert(!header.parentHash.isEmpty, 'Unable to retrieve header and parent from supplied hash');
@@ -150,7 +150,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     const version = this.registry.createType('RuntimeVersionPartial',
       (firstVersion && (lastVersion || firstVersion.specVersion.eq(this._runtimeVersion.specVersion)))
         ? { specName: this._runtimeVersion.specName, specVersion: firstVersion.specVersion }
-        : await (this._rpcCore.state.getRuntimeVersion as RpcInterfaceMethod).json(header.parentHash).toPromise()
+        : await firstValueFrom((this._rpcCore.state.getRuntimeVersion as RpcInterfaceMethod).json(header.parentHash))
     );
 
     // check for pre-existing registries
@@ -165,7 +165,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     // nothing has been found, construct new
     const registry = new TypeRegistry(blockHash);
     const metadata = new Metadata(registry,
-      await (this._rpcCore.state.getMetadata as RpcInterfaceMethod).raw(header.parentHash).toPromise()
+      await firstValueFrom((this._rpcCore.state.getMetadata as RpcInterfaceMethod).raw(header.parentHash))
     );
 
     this._initRegistry(registry, this._runtimeChain as Text, version, metadata);
@@ -220,8 +220,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
   }
 
   private _detectCapabilities (registry: Registry, blockHash?: string | Uint8Array): boolean {
-    detectedCapabilities(this._rx, blockHash)
-      .toPromise()
+    firstValueFrom(detectedCapabilities(this._rx, blockHash))
       .then((types): void => {
         if (Object.keys(types).length) {
           registry.register(types as Record<string, string>);
@@ -273,14 +272,14 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
 
   private async _metaFromChain (optMetadata?: Record<string, string>): Promise<[Hash, Metadata]> {
     const [genesisHash, runtimeVersion, chain, chainProps, rpcMethods, chainMetadata] = await Promise.all([
-      this._rpcCore.chain.getBlockHash(0).toPromise(),
-      this._rpcCore.state.getRuntimeVersion().toPromise(),
-      this._rpcCore.system.chain().toPromise(),
-      this._rpcCore.system.properties().toPromise(),
-      this._rpcCore.rpc.methods().toPromise(),
+      firstValueFrom(this._rpcCore.chain.getBlockHash(0)),
+      firstValueFrom(this._rpcCore.state.getRuntimeVersion()),
+      firstValueFrom(this._rpcCore.system.chain()),
+      firstValueFrom(this._rpcCore.system.properties()),
+      firstValueFrom(this._rpcCore.rpc.methods()),
       optMetadata
         ? Promise.resolve(null)
-        : this._rpcCore.state.getMetadata().toPromise()
+        : firstValueFrom(this._rpcCore.state.getMetadata())
     ]);
 
     // set our chain version & genesisHash as returned
@@ -293,7 +292,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
     const metadata = chainMetadata || (
       optMetadata && optMetadata[metadataKey]
         ? new Metadata(this.registry, optMetadata[metadataKey])
-        : await this._rpcCore.state.getMetadata().toPromise()
+        : await firstValueFrom(this._rpcCore.state.getMetadata())
     );
 
     // initializes the registry & RPC
@@ -369,7 +368,7 @@ export abstract class Init<ApiType extends ApiTypes> extends Decorate<ApiType> {
       }
 
       this.#healthTimer = setInterval((): void => {
-        this._rpcCore.system.health().toPromise().catch(() => undefined);
+        firstValueFrom(this._rpcCore.system.health()).catch(() => undefined);
       }, KEEPALIVE_INTERVAL);
     } catch (_error) {
       const error = new Error(`FATAL: Unable to initialize the API: ${(_error as Error).message}`);
diff --git a/packages/api/src/base/capabilities.ts b/packages/api/src/base/capabilities.ts
index c06eb60d17..d8d139894f 100644
--- a/packages/api/src/base/capabilities.ts
+++ b/packages/api/src/base/capabilities.ts
@@ -1,14 +1,15 @@
 // Copyright 2017-2021 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Raw, u32 } from '@polkadot/types';
 import type { Releases } from '@polkadot/types/interfaces';
 import type { InterfaceTypes } from '@polkadot/types/types';
 
+import { catchError, combineLatest, map, of, take } from 'rxjs';
+
 import { assert, compactFromU8a } from '@polkadot/util';
-import { combineLatest, Observable, of } from '@polkadot/x-rxjs';
-import { catchError, map, take } from '@polkadot/x-rxjs/operators';
 
 // the order and types needs to map with the all array setup below
 type ExtractedQ = [Releases | null];
diff --git a/packages/api/src/packageInfo.ts b/packages/api/src/packageInfo.ts
index 54e34ff01e..f7c8c2b42b 100644
--- a/packages/api/src/packageInfo.ts
+++ b/packages/api/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/api', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/api', version: '4.17.2-8' };
diff --git a/packages/api/src/promise/index.ts b/packages/api/src/promise/index.ts
index 3756c97ed7..8a0c33fda9 100644
--- a/packages/api/src/promise/index.ts
+++ b/packages/api/src/promise/index.ts
@@ -1,12 +1,13 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { Callback, Codec } from '@polkadot/types/types';
 import type { ApiOptions, DecorateFn, DecorateMethodOptions, ObsInnerType, StorageEntryPromiseOverloads, UnsubscribePromise, VoidFn } from '../types';
 
+import { catchError, EMPTY, Subscription, tap } from 'rxjs';
+
 import { assert, isFunction } from '@polkadot/util';
-import { EMPTY, Observable, Subscription } from '@polkadot/x-rxjs';
-import { catchError, tap } from '@polkadot/x-rxjs/operators';
 
 import { ApiBase } from '../base';
 import { Combinator, CombinatorCallback, CombinatorFunction } from './Combinator';
diff --git a/packages/api/src/rx/index.ts b/packages/api/src/rx/index.ts
index b211030eb2..91e6268fb4 100644
--- a/packages/api/src/rx/index.ts
+++ b/packages/api/src/rx/index.ts
@@ -4,7 +4,7 @@
 import type { Codec } from '@polkadot/types/types';
 import type { ApiOptions, DecorateFn } from '../types';
 
-import { from, Observable } from '@polkadot/x-rxjs';
+import { from, Observable } from 'rxjs';
 
 import { ApiBase } from '../base';
 
@@ -48,8 +48,7 @@ export function decorateMethod <Method extends DecorateFn<Codec>> (method: Metho
  * <BR>
  *
  * ```javascript
- * import { combineLatest } from '@polkadot/x-rxjs';
- * import { pairwise, switchMap } from '@polkadot/x-rxjs/operators';
+ * import { combineLatest, pairwise, switchMap } from 'rxjs';
  * import { ApiRx, WsProvider } from '@polkadot/api';
  *
  *
@@ -78,7 +77,7 @@ export function decorateMethod <Method extends DecorateFn<Codec>> (method: Metho
  * <BR>
  *
  * ```javascript
- * import { first, switchMap } from '@polkadot/x-rxjs/operators';
+ * import { first, switchMap } from 'rxjs';
  * import ApiRx from '@polkadot/api/rx';
  *
  * // import the test keyring (already has dev keys for Alice, Bob, Charlie, Eve & Ferdie)
@@ -122,7 +121,7 @@ export class ApiRx extends ApiBase<'rxjs'> {
    * <BR>
    *
    * ```javascript
-   * import { switchMap } from '@polkadot/x-rxjs/operators';
+   * import { switchMap } from 'rxjs';
    * import Api from '@polkadot/api/rx';
    *
    * Api.create()
@@ -146,7 +145,7 @@ export class ApiRx extends ApiBase<'rxjs'> {
    * <BR>
    *
    * ```javascript
-   * import { switchMap } from '@polkadot/x-rxjs/operators';
+   * import { switchMap } from 'rxjs';
    * import Api from '@polkadot/api/rx';
    *
    * new Api().isReady
diff --git a/packages/api/src/submittable/createClass.ts b/packages/api/src/submittable/createClass.ts
index f15462fb83..8b1ef1cf12 100644
--- a/packages/api/src/submittable/createClass.ts
+++ b/packages/api/src/submittable/createClass.ts
@@ -3,15 +3,15 @@
 
 /* eslint-disable no-dupe-class-members */
 
+import type { Observable } from 'rxjs';
 import type { Address, ApplyExtrinsicResult, Call, Extrinsic, ExtrinsicEra, ExtrinsicStatus, Hash, Header, Index, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
 import type { Callback, Codec, Constructor, IKeyringPair, ISubmittableResult, Registry, SignatureOptions } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { ApiInterfaceRx, ApiTypes, SignerResult } from '../types';
 import type { AddressOrPair, SignerOptions, SubmittableDryRunResult, SubmittableExtrinsic, SubmittablePaymentResult, SubmittableResultResult, SubmittableResultSubscription, SubmittableThis } from './types';
 
+import { catchError, first, map, mapTo, mergeMap, of, switchMap, tap } from 'rxjs';
+
 import { assert, isBn, isFunction, isNumber, isString, isU8a } from '@polkadot/util';
-import { of } from '@polkadot/x-rxjs';
-import { catchError, first, map, mapTo, mergeMap, switchMap, tap } from '@polkadot/x-rxjs/operators';
 
 import { ApiBase } from '../base';
 import { filterEvents, isKeyringPair } from '../util';
diff --git a/packages/api/src/submittable/types.ts b/packages/api/src/submittable/types.ts
index 034f0fd53b..533aa34651 100644
--- a/packages/api/src/submittable/types.ts
+++ b/packages/api/src/submittable/types.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { AccountId, Address, ApplyExtrinsicResult, DispatchError, DispatchInfo, EventRecord, Extrinsic, ExtrinsicStatus, Hash, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
 import type { AnyNumber, Callback, Codec, IExtrinsicEra, IKeyringPair, ISubmittableResult, Signer } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { ApiTypes } from '../types';
 
 export interface SubmittableResultValue {
diff --git a/packages/api/src/types/base.ts b/packages/api/src/types/base.ts
index d5eae22156..7bc42526da 100644
--- a/packages/api/src/types/base.ts
+++ b/packages/api/src/types/base.ts
@@ -1,8 +1,8 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { AnyFunction, Callback, Codec, CodecArg } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 
 export type Push<T extends readonly unknown[], V> = [...T, V]
 
diff --git a/packages/api/src/types/rpc.ts b/packages/api/src/types/rpc.ts
index 27b8a2f9ce..ac24360ec1 100644
--- a/packages/api/src/types/rpc.ts
+++ b/packages/api/src/types/rpc.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { Json, Raw } from '@polkadot/types/codec';
 import type { AnyFunction, Callback, DefinitionRpc } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { ApiTypes, PromiseResult, Push, RxResult, UnsubscribePromise } from './base';
diff --git a/packages/api/src/types/storage.ts b/packages/api/src/types/storage.ts
index a7a4583fa1..74fb54ae93 100644
--- a/packages/api/src/types/storage.ts
+++ b/packages/api/src/types/storage.ts
@@ -1,11 +1,11 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { StorageKey, u64 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { AnyFunction, AnyTuple, Callback, Codec, CodecArg, IStorageKey } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { ApiTypes, DropLast, MethodResult, ObsInnerType, PaginationOptions, PromiseOrObs, UnsubscribePromise } from './base';
 
 interface StorageEntryObservableMulti {
diff --git a/packages/api/test/typesBundleDerive.spec.ts b/packages/api/test/typesBundleDerive.spec.ts
index 6805195bf8..4007e6b370 100644
--- a/packages/api/test/typesBundleDerive.spec.ts
+++ b/packages/api/test/typesBundleDerive.spec.ts
@@ -1,18 +1,17 @@
 // Copyright 2017-2021 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Enum, Struct } from '@polkadot/types';
 import type { Option } from '@polkadot/types/codec';
 import type { AccountId, AccountIndex, AccountInfo, Address, Balance, BlockNumber, Index } from '@polkadot/types/interfaces';
-import type { Observable } from '@polkadot/x-rxjs';
 
 import { jest } from '@jest/globals';
+import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { memo } from '@polkadot/api-derive/util/memo';
-import { combineLatest, of } from '@polkadot/x-rxjs';
-import { map, switchMap } from '@polkadot/x-rxjs/operators';
 
 interface VestingInfo extends Struct {
   readonly locked: Balance;
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index cb951a5c80..249d91d4b2 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/metadata",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
@@ -20,12 +20,12 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/types-known": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/util-crypto": "^6.11.1"
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/types-known": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "@polkadot/util-crypto": "^6.11.2-6"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.1"
+    "@polkadot/keyring": "^6.11.2-6"
   }
 }
diff --git a/packages/metadata/src/packageInfo.ts b/packages/metadata/src/packageInfo.ts
index e3c1b01bfc..b6b017b6c8 100644
--- a/packages/metadata/src/packageInfo.ts
+++ b/packages/metadata/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/metadata', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/metadata', version: '4.17.2-8' };
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index 71441777b5..2ee63d212e 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -20,13 +20,13 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/metadata": "4.17.2-7",
-    "@polkadot/rpc-provider": "4.17.2-7",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/x-rxjs": "^6.11.1"
+    "@polkadot/metadata": "4.17.2-8",
+    "@polkadot/rpc-provider": "4.17.2-8",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.1"
+    "@polkadot/keyring": "^6.11.2-6"
   }
 }
diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts
index fd9df9e278..ab7e33ef50 100644
--- a/packages/rpc-core/src/index.ts
+++ b/packages/rpc-core/src/index.ts
@@ -3,20 +3,20 @@
 
 import './detectPackage';
 
+import type { Observer } from 'rxjs';
 import type { ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types';
 import type { StorageKey, Vec } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
 import type { AnyJson, Codec, DefinitionRpc, DefinitionRpcExt, DefinitionRpcSub, Registry } from '@polkadot/types/types';
 import type { Memoized } from '@polkadot/util/types';
-import type { Observer } from '@polkadot/x-rxjs';
 import type { RpcInterface, RpcInterfaceMethod } from './types';
 
+import { Observable, publishReplay, refCount } from 'rxjs';
+
 import { Option } from '@polkadot/types';
 import { createClass, createTypeUnsafe } from '@polkadot/types/create';
 import jsonrpc from '@polkadot/types/interfaces/jsonrpc';
 import { assert, hexToU8a, isFunction, isNull, isUndefined, logger, memoize, u8aToU8a } from '@polkadot/util';
-import { Observable } from '@polkadot/x-rxjs';
-import { publishReplay, refCount } from '@polkadot/x-rxjs/operators';
 
 import { drr, refCountDelay } from './util';
 
diff --git a/packages/rpc-core/src/packageInfo.ts b/packages/rpc-core/src/packageInfo.ts
index 7c2abd043b..8dcc9509e9 100644
--- a/packages/rpc-core/src/packageInfo.ts
+++ b/packages/rpc-core/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-core', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/rpc-core', version: '4.17.2-8' };
diff --git a/packages/rpc-core/src/replay.spec.ts b/packages/rpc-core/src/replay.spec.ts
index 5e1b57d97c..19f382b26f 100644
--- a/packages/rpc-core/src/replay.spec.ts
+++ b/packages/rpc-core/src/replay.spec.ts
@@ -1,12 +1,13 @@
 // Copyright 2017-2021 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { RpcInterface } from '@polkadot/rpc-core/types.jsonrpc';
-import type { Observable } from '@polkadot/x-rxjs';
+
+import { of } from 'rxjs';
 
 import { MockProvider } from '@polkadot/rpc-provider/mock';
 import { TypeRegistry } from '@polkadot/types/create';
-import { of } from '@polkadot/x-rxjs';
 
 import { RpcCore } from '.';
 
diff --git a/packages/rpc-core/src/types.ts b/packages/rpc-core/src/types.ts
index a482eb1624..b6e06ead27 100644
--- a/packages/rpc-core/src/types.ts
+++ b/packages/rpc-core/src/types.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { Json, Raw } from '@polkadot/types';
 import type { Codec, DefinitionRpc } from '@polkadot/types/types';
-import type { Observable } from '@polkadot/x-rxjs';
 
 export * from './types.jsonrpc';
 
diff --git a/packages/rpc-core/src/util/drr.spec.ts b/packages/rpc-core/src/util/drr.spec.ts
index 48ad746074..910e9e6276 100644
--- a/packages/rpc-core/src/util/drr.spec.ts
+++ b/packages/rpc-core/src/util/drr.spec.ts
@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { jest } from '@jest/globals';
-
-import { of, timer } from '@polkadot/x-rxjs';
+import { of, timer } from 'rxjs';
 
 import { drr } from '.';
 
diff --git a/packages/rpc-core/src/util/drr.ts b/packages/rpc-core/src/util/drr.ts
index 1fad5fe10f..de5dae4c01 100644
--- a/packages/rpc-core/src/util/drr.ts
+++ b/packages/rpc-core/src/util/drr.ts
@@ -1,10 +1,11 @@
 // Copyright 2017-2021 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Observable } from '@polkadot/x-rxjs';
+import type { Observable } from 'rxjs';
+
+import { catchError, distinctUntilChanged, publishReplay, refCount, tap } from 'rxjs';
 
 import { logger, stringify } from '@polkadot/util';
-import { catchError, distinctUntilChanged, publishReplay, refCount, tap } from '@polkadot/x-rxjs/operators';
 
 import { refCountDelay } from './refCountDelay';
 
diff --git a/packages/rpc-core/src/util/refCountDelay.ts b/packages/rpc-core/src/util/refCountDelay.ts
index ad7c9fad10..b5da5f887c 100644
--- a/packages/rpc-core/src/util/refCountDelay.ts
+++ b/packages/rpc-core/src/util/refCountDelay.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ConnectableObservable, MonoTypeOperatorFunction, TeardownLogic } from '@polkadot/x-rxjs';
+import type { ConnectableObservable, MonoTypeOperatorFunction, TeardownLogic } from 'rxjs';
 
-import { asapScheduler, Observable, Subscription } from '@polkadot/x-rxjs';
+import { asapScheduler, Observable, Subscription } from 'rxjs';
 
 /** @internal */
 export function refCountDelay <T> (delay = 1750): MonoTypeOperatorFunction<T> {
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index 0cdd8b7b3c..c4e713782f 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Transport providers for the API",
   "main": "index.js",
@@ -20,17 +20,17 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/util-crypto": "^6.11.1",
-    "@polkadot/x-fetch": "^6.11.1",
-    "@polkadot/x-global": "^6.11.1",
-    "@polkadot/x-ws": "^6.11.1",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "@polkadot/util-crypto": "^6.11.2-6",
+    "@polkadot/x-fetch": "^6.11.2-6",
+    "@polkadot/x-global": "^6.11.2-6",
+    "@polkadot/x-ws": "^6.11.2-6",
     "eventemitter3": "^4.0.7"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.1",
-    "@polkadot/metadata": "4.17.2-7",
+    "@polkadot/keyring": "^6.11.2-6",
+    "@polkadot/metadata": "4.17.2-8",
     "mock-socket": "^9.0.3",
     "nock": "^13.1.1"
   }
diff --git a/packages/rpc-provider/src/packageInfo.ts b/packages/rpc-provider/src/packageInfo.ts
index 2bf4e857bf..28af9875d6 100644
--- a/packages/rpc-provider/src/packageInfo.ts
+++ b/packages/rpc-provider/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/rpc-provider', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/rpc-provider', version: '4.17.2-8' };
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index 9b96fa6bd7..95040d8470 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Type generation scripts",
   "main": "index.js",
@@ -29,11 +29,11 @@
     "@babel/core": "^7.14.6",
     "@babel/register": "^7.14.5",
     "@babel/runtime": "^7.14.6",
-    "@polkadot/api": "4.17.2-7",
-    "@polkadot/metadata": "4.17.2-7",
-    "@polkadot/rpc-provider": "4.17.2-7",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
+    "@polkadot/api": "4.17.2-8",
+    "@polkadot/metadata": "4.17.2-8",
+    "@polkadot/rpc-provider": "4.17.2-8",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
     "handlebars": "^4.7.7",
     "websocket": "^1.0.34",
     "yargs": "^17.0.1"
diff --git a/packages/typegen/src/packageInfo.ts b/packages/typegen/src/packageInfo.ts
index 8ec53d49bf..205e8991e2 100644
--- a/packages/typegen/src/packageInfo.ts
+++ b/packages/typegen/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/typegen', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/typegen', version: '4.17.2-8' };
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
index ce5b14f5f7..ab7e4f0f4b 100644
--- a/packages/types-known/package.json
+++ b/packages/types-known/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -20,8 +20,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/networks": "^6.11.1",
-    "@polkadot/types": "4.17.2-7",
-    "@polkadot/util": "^6.11.1"
+    "@polkadot/networks": "^6.11.2-6",
+    "@polkadot/types": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6"
   }
 }
diff --git a/packages/types-known/src/packageInfo.ts b/packages/types-known/src/packageInfo.ts
index 03467808fe..86347fc974 100644
--- a/packages/types-known/src/packageInfo.ts
+++ b/packages/types-known/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types-known', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/types-known', version: '4.17.2-8' };
diff --git a/packages/types/package.json b/packages/types/package.json
index 0d5ea0c8c9..dc63898a18 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "4.17.2-7",
+  "version": "4.17.2-8",
   "type": "module",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
@@ -20,13 +20,13 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@polkadot/metadata": "4.17.2-7",
-    "@polkadot/util": "^6.11.1",
-    "@polkadot/util-crypto": "^6.11.1",
-    "@polkadot/x-rxjs": "^6.11.1"
+    "@polkadot/metadata": "4.17.2-8",
+    "@polkadot/util": "^6.11.2-6",
+    "@polkadot/util-crypto": "^6.11.2-6",
+    "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^6.11.1",
+    "@polkadot/keyring": "^6.11.2-6",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9"
   }
diff --git a/packages/types/src/packageInfo.ts b/packages/types/src/packageInfo.ts
index 7becad5ec4..e51dbd709f 100644
--- a/packages/types/src/packageInfo.ts
+++ b/packages/types/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/types', version: '4.17.2-7' };
+export const packageInfo = { name: '@polkadot/types', version: '4.17.2-8' };
diff --git a/packages/types/src/types/index.ts b/packages/types/src/types/index.ts
index 6442d58a04..144e8bbacf 100644
--- a/packages/types/src/types/index.ts
+++ b/packages/types/src/types/index.ts
@@ -14,4 +14,4 @@ export * from './interfaces';
 export * from './registry';
 
 // used inside augmented definitions
-export type { Observable } from '@polkadot/x-rxjs';
+export type { Observable } from 'rxjs';
diff --git a/packages/types/src/types/registry.ts b/packages/types/src/types/registry.ts
index d629626d7e..7124230a7d 100644
--- a/packages/types/src/types/registry.ts
+++ b/packages/types/src/types/registry.ts
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Observable } from 'rxjs';
 import type { Metadata } from '@polkadot/metadata';
 import type { BN } from '@polkadot/util';
-import type { Observable } from '@polkadot/x-rxjs';
 import type { ExtDef } from '../extrinsic/signedExtensions/types';
 import type { CodecHash, Hash } from '../interfaces/runtime';
 import type { ChainProperties } from '../interfaces/system';
diff --git a/yarn.lock b/yarn.lock
index 174a98645d..b38f7ffac8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1867,45 +1867,45 @@ __metadata:
   resolution: "@polkadot/api-contract@workspace:packages/api-contract"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/api": 4.17.2-7
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/x-rxjs": ^6.11.1
+    "@polkadot/api": 4.17.2-8
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    rxjs: ^7.2.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-derive@4.17.2-7, @polkadot/api-derive@workspace:packages/api-derive":
+"@polkadot/api-derive@4.17.2-8, @polkadot/api-derive@workspace:packages/api-derive":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-derive@workspace:packages/api-derive"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/api": 4.17.2-7
-    "@polkadot/keyring": ^6.11.1
-    "@polkadot/rpc-core": 4.17.2-7
-    "@polkadot/rpc-provider": 4.17.2-7
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/util-crypto": ^6.11.1
-    "@polkadot/x-rxjs": ^6.11.1
+    "@polkadot/api": 4.17.2-8
+    "@polkadot/keyring": ^6.11.2-6
+    "@polkadot/rpc-core": 4.17.2-8
+    "@polkadot/rpc-provider": 4.17.2-8
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    "@polkadot/util-crypto": ^6.11.2-6
+    rxjs: ^7.2.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/api@4.17.2-7, @polkadot/api@workspace:packages/api":
+"@polkadot/api@4.17.2-8, @polkadot/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@polkadot/api@workspace:packages/api"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/api-derive": 4.17.2-7
-    "@polkadot/keyring": ^6.11.1
-    "@polkadot/metadata": 4.17.2-7
-    "@polkadot/rpc-core": 4.17.2-7
-    "@polkadot/rpc-provider": 4.17.2-7
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/types-known": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/util-crypto": ^6.11.1
-    "@polkadot/x-rxjs": ^6.11.1
+    "@polkadot/api-derive": 4.17.2-8
+    "@polkadot/keyring": ^6.11.2-6
+    "@polkadot/metadata": 4.17.2-8
+    "@polkadot/rpc-core": 4.17.2-8
+    "@polkadot/rpc-provider": 4.17.2-8
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/types-known": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    "@polkadot/util-crypto": ^6.11.2-6
     eventemitter3: ^4.0.7
+    rxjs: ^7.2.0
   languageName: unknown
   linkType: soft
 
@@ -2002,69 +2002,69 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/keyring@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/keyring@npm:6.11.1"
+"@polkadot/keyring@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/keyring@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/util": 6.11.1
-    "@polkadot/util-crypto": 6.11.1
+    "@polkadot/util": 6.11.2-6
+    "@polkadot/util-crypto": 6.11.2-6
   peerDependencies:
-    "@polkadot/util": 6.11.1
-    "@polkadot/util-crypto": 6.11.1
-  checksum: 16c0352697380f60ef4bcd72949dbf8d63057ad0c9f24a5de24b788d40d16f0fb00b7fe9b455addcdb113480a499af4b322fded6b4db1be185321650110a31f2
+    "@polkadot/util": 6.11.2-6
+    "@polkadot/util-crypto": 6.11.2-6
+  checksum: f50f1f349219b56a833c34d099338d4fe43c80e790075df800cea447b980f9d95fde1f2279d8ed496bed0faaa428c6b320c7b253905ea9ec88f69426fdc19f5c
   languageName: node
   linkType: hard
 
-"@polkadot/metadata@4.17.2-7, @polkadot/metadata@workspace:packages/metadata":
+"@polkadot/metadata@4.17.2-8, @polkadot/metadata@workspace:packages/metadata":
   version: 0.0.0-use.local
   resolution: "@polkadot/metadata@workspace:packages/metadata"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/keyring": ^6.11.1
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/types-known": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/util-crypto": ^6.11.1
+    "@polkadot/keyring": ^6.11.2-6
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/types-known": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    "@polkadot/util-crypto": ^6.11.2-6
   languageName: unknown
   linkType: soft
 
-"@polkadot/networks@npm:6.11.1, @polkadot/networks@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/networks@npm:6.11.1"
+"@polkadot/networks@npm:6.11.2-6, @polkadot/networks@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/networks@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-  checksum: 33ec4d0b8dc97a79ba0ec244fcecf20b0b72a2d6c61e8099da6da2ee7e6ff8ea336791b45191f10dd07ffdae7fde46e0292e77a0514c671bf28618e7a5e0fd5e
+  checksum: 6f245a08d4b9bf2df12659aec703fba70605c4357d0c464f38bb64c994f4af23f77ec817306c19196fb59010e89964523edded1f9f09f6bd209d4497e1dadcb0
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-core@4.17.2-7, @polkadot/rpc-core@workspace:packages/rpc-core":
+"@polkadot/rpc-core@4.17.2-8, @polkadot/rpc-core@workspace:packages/rpc-core":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/keyring": ^6.11.1
-    "@polkadot/metadata": 4.17.2-7
-    "@polkadot/rpc-provider": 4.17.2-7
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/x-rxjs": ^6.11.1
+    "@polkadot/keyring": ^6.11.2-6
+    "@polkadot/metadata": 4.17.2-8
+    "@polkadot/rpc-provider": 4.17.2-8
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    rxjs: ^7.2.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-provider@4.17.2-7, @polkadot/rpc-provider@workspace:packages/rpc-provider":
+"@polkadot/rpc-provider@4.17.2-8, @polkadot/rpc-provider@workspace:packages/rpc-provider":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/keyring": ^6.11.1
-    "@polkadot/metadata": 4.17.2-7
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/util-crypto": ^6.11.1
-    "@polkadot/x-fetch": ^6.11.1
-    "@polkadot/x-global": ^6.11.1
-    "@polkadot/x-ws": ^6.11.1
+    "@polkadot/keyring": ^6.11.2-6
+    "@polkadot/metadata": 4.17.2-8
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    "@polkadot/util-crypto": ^6.11.2-6
+    "@polkadot/x-fetch": ^6.11.2-6
+    "@polkadot/x-global": ^6.11.2-6
+    "@polkadot/x-ws": ^6.11.2-6
     eventemitter3: ^4.0.7
     mock-socket: ^9.0.3
     nock: ^13.1.1
@@ -2087,11 +2087,11 @@ __metadata:
     "@babel/core": ^7.14.6
     "@babel/register": ^7.14.5
     "@babel/runtime": ^7.14.6
-    "@polkadot/api": 4.17.2-7
-    "@polkadot/metadata": 4.17.2-7
-    "@polkadot/rpc-provider": 4.17.2-7
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/util": ^6.11.1
+    "@polkadot/api": 4.17.2-8
+    "@polkadot/metadata": 4.17.2-8
+    "@polkadot/rpc-provider": 4.17.2-8
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
     "@types/websocket": ^1.0.3
     "@types/yargs": ^17.0.2
     handlebars: ^4.7.7
@@ -2106,41 +2106,41 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-known@4.17.2-7, @polkadot/types-known@workspace:packages/types-known":
+"@polkadot/types-known@4.17.2-8, @polkadot/types-known@workspace:packages/types-known":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-known@workspace:packages/types-known"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/networks": ^6.11.1
-    "@polkadot/types": 4.17.2-7
-    "@polkadot/util": ^6.11.1
+    "@polkadot/networks": ^6.11.2-6
+    "@polkadot/types": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
   languageName: unknown
   linkType: soft
 
-"@polkadot/types@4.17.2-7, @polkadot/types@workspace:packages/types":
+"@polkadot/types@4.17.2-8, @polkadot/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/keyring": ^6.11.1
-    "@polkadot/metadata": 4.17.2-7
-    "@polkadot/util": ^6.11.1
-    "@polkadot/util-crypto": ^6.11.1
-    "@polkadot/x-rxjs": ^6.11.1
+    "@polkadot/keyring": ^6.11.2-6
+    "@polkadot/metadata": 4.17.2-8
+    "@polkadot/util": ^6.11.2-6
+    "@polkadot/util-crypto": ^6.11.2-6
     "@types/bn.js": ^4.11.6
     bn.js: ^4.11.9
+    rxjs: ^7.2.0
   languageName: unknown
   linkType: soft
 
-"@polkadot/util-crypto@npm:6.11.1, @polkadot/util-crypto@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/util-crypto@npm:6.11.1"
+"@polkadot/util-crypto@npm:6.11.2-6, @polkadot/util-crypto@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/util-crypto@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/networks": 6.11.1
-    "@polkadot/util": 6.11.1
+    "@polkadot/networks": 6.11.2-6
+    "@polkadot/util": 6.11.2-6
     "@polkadot/wasm-crypto": ^4.0.2
-    "@polkadot/x-randomvalues": 6.11.1
+    "@polkadot/x-randomvalues": 6.11.2-6
     base-x: ^3.0.8
     base64-js: ^1.5.1
     blakejs: ^1.1.1
@@ -2153,23 +2153,23 @@ __metadata:
     tweetnacl: ^1.0.3
     xxhashjs: ^0.2.2
   peerDependencies:
-    "@polkadot/util": 6.11.1
-  checksum: 453476635b15a5a97a8814f1ae80527948d74f14e7c4d549d8c8a48f6ba48412b0d479a3ea426db4b1e0a2a01348d8744455194bdea6376f96afbe19f2fb895c
+    "@polkadot/util": 6.11.2-6
+  checksum: 0382e3fb6553566f64e7e1e68a4882863b08ed5528fb8bf78754eb3b8461d6500620e62f4e9293bc53c481d14a1cde3e56aa6afc0d797bbfeaeccef2990a35e2
   languageName: node
   linkType: hard
 
-"@polkadot/util@npm:6.11.1, @polkadot/util@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/util@npm:6.11.1"
+"@polkadot/util@npm:6.11.2-6, @polkadot/util@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/util@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/x-textdecoder": 6.11.1
-    "@polkadot/x-textencoder": 6.11.1
+    "@polkadot/x-textdecoder": 6.11.2-6
+    "@polkadot/x-textencoder": 6.11.2-6
     "@types/bn.js": ^4.11.6
     bn.js: ^4.11.9
     camelcase: ^5.3.1
     ip-regex: ^4.3.0
-  checksum: f2583926abeabc323a0822621f5db898717f20b8eb1dec4da08910c9885823bfd5bae0db1ba02c41c775b49a9d345c927f1300a761b5c24953a438c93c68adee
+  checksum: bef228af501482713e83c0c2c02dbd90148491ce557424c9aa31fe090d589f8cfa6a1df9bab1278574608fdb6ff80c1e52177da23b4e32abeef6d4b25bb4382d
   languageName: node
   linkType: hard
 
@@ -2205,76 +2205,66 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/x-fetch@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-fetch@npm:6.11.1"
+"@polkadot/x-fetch@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/x-fetch@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
+    "@polkadot/x-global": 6.11.2-6
     "@types/node-fetch": ^2.5.10
     node-fetch: ^2.6.1
-  checksum: 06d96c8a3ece6b11651948f644823de28aed0eea416466fc00b9dfa60b89a39476b679784c4b64c7ca541a95cb6552030f66974df58269eda0024721850ff1be
+  checksum: 31d44e183a2481634c8feaa2a285a9f04d94734416612088f0677591ea4a7b822ea8f610c184fdd2a9309b0b4cfec1b64fd648ac9138491f286d7099b3141cb4
   languageName: node
   linkType: hard
 
-"@polkadot/x-global@npm:6.11.1, @polkadot/x-global@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-global@npm:6.11.1"
+"@polkadot/x-global@npm:6.11.2-6, @polkadot/x-global@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/x-global@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-  checksum: c0114b2fe8a0f4b238f39b4040a5c917e968bf912b2186bb0860597ead9921c2200dbb91b4462d6476be1243297d1b34479fdd79e934927d4d076005f36c26c9
+  checksum: fa7f6966e5466099f42d91e307a448e90e80e9261ae2335a3144219a11ec7a265fa5cba031b1fee6034d68a7b4e9ee4a1df89b4822d796fcd89ea633a3476b03
   languageName: node
   linkType: hard
 
-"@polkadot/x-randomvalues@npm:6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-randomvalues@npm:6.11.1"
+"@polkadot/x-randomvalues@npm:6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/x-randomvalues@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
-  checksum: b50f64be1d8c76fcae08016d34049f31bd30642c2208ecbacac2b21266dbc05fe284e396b4da044acf5e426895391dfc297f5d22ddb01e786c7e6f4778b19e48
+    "@polkadot/x-global": 6.11.2-6
+  checksum: 5b92d1a22c0aa2a5fd8eec264f4c32b1fa8165b6c34f2eac34a5ac8e8f013d671aa76382f2c895250ce6b373c1d22bde07e24139419858353de6411161aea0fd
   languageName: node
   linkType: hard
 
-"@polkadot/x-rxjs@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-rxjs@npm:6.11.1"
+"@polkadot/x-textdecoder@npm:6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/x-textdecoder@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    rxjs: ^6.6.7
-  checksum: e7808856d7e9ae51a459678e1fbb2e6a85c990d30a31d1e572b4312981ea70f5306a1c9e60c06b00ecced8d0774893d2d0e4baa8d67903e6b456b938b02c52fb
+    "@polkadot/x-global": 6.11.2-6
+  checksum: 743be22ca63b84054490d4517bfe9bed10ce63a38fc67c08998e3b4922adda9470ee4eef83ab0460dd9dcb67407979e376b60de0f4d0a4ac0f67160527436d97
   languageName: node
   linkType: hard
 
-"@polkadot/x-textdecoder@npm:6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-textdecoder@npm:6.11.1"
+"@polkadot/x-textencoder@npm:6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/x-textencoder@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
-  checksum: 6daf7246a0bf74afd2eecd11c63b75499ae07a1d689c4f813ad2b69fb4292b0484889b950a5758958ce4e3bcedea3458f467dc13a3fa3e1366d33c32678d69b6
+    "@polkadot/x-global": 6.11.2-6
+  checksum: c03d1a0fdb9dfe6a681071708244306d4fb283d16f0c7c46d2d22762ad82b5336607f1060d8628fa88f77a407ae0953f9248165c370baeb06feeb616ac2ae077
   languageName: node
   linkType: hard
 
-"@polkadot/x-textencoder@npm:6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-textencoder@npm:6.11.1"
+"@polkadot/x-ws@npm:^6.11.2-6":
+  version: 6.11.2-6
+  resolution: "@polkadot/x-ws@npm:6.11.2-6"
   dependencies:
     "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
-  checksum: 29f740cc230b3235a71e718b3a240a8f6892f675cd04bc9d995937d9053af16bc117161ed285d4bd55d5ddfab6389b9d4736c74f41eeef7196ec175519c83934
-  languageName: node
-  linkType: hard
-
-"@polkadot/x-ws@npm:^6.11.1":
-  version: 6.11.1
-  resolution: "@polkadot/x-ws@npm:6.11.1"
-  dependencies:
-    "@babel/runtime": ^7.14.6
-    "@polkadot/x-global": 6.11.1
+    "@polkadot/x-global": 6.11.2-6
     "@types/websocket": ^1.0.3
     websocket: ^1.0.34
-  checksum: 056b7e03d7bc643ab2d4d3beba7fa97e3dcab8c9cb152677610214ecc34f0c02c2ae7e40d33903c8aeafa0f9c20e106d94785849ca1b9c890e031b1ecd98a9b8
+  checksum: 6e3d0274323e6372d2b6a57205148b10bb1c6636e2d74cf0e1b132381e7140a0248f614c01b2139ea31ba16ddf1e4f9311da38df6bdae2fd8acd85cd06f69f9c
   languageName: node
   linkType: hard
 
@@ -9664,7 +9654,7 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^6.6.6, rxjs@npm:^6.6.7":
+"rxjs@npm:^6.6.6":
   version: 6.6.7
   resolution: "rxjs@npm:6.6.7"
   dependencies:
@@ -9673,6 +9663,15 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "rxjs@npm:7.2.0"
+  dependencies:
+    tslib: ~2.1.0
+  checksum: 92a3511035b3d51e97018247218183e5ef88d167ef271c1222be1b2d98b4a5daa5c3827e2b536c3f11f91ad435907820e7a91446d92f222430fd00e0b9f7dbba
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
@@ -10620,6 +10619,13 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
+"tslib@npm:~2.1.0":
+  version: 2.1.0
+  resolution: "tslib@npm:2.1.0"
+  checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78
+  languageName: node
+  linkType: hard
+
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"