diff --git a/components/rmrk/Create/Admin/AdminPanel.vue b/components/rmrk/Create/Admin/AdminPanel.vue
index 440eece548..e90339ca40 100644
--- a/components/rmrk/Create/Admin/AdminPanel.vue
+++ b/components/rmrk/Create/Admin/AdminPanel.vue
@@ -138,13 +138,7 @@ export default class AdminPanel extends mixins(
       data: { collectionEntities },
     } = collections
 
-    this.collections = collectionEntities.nodes
-      ?.map((ce: any) => ({
-        ...ce,
-        available: ce.nfts?.totalCount,
-        nfts: ce.nfts?.nodes?.map((n: AdminNFT) => n),
-      }))
-      .filter((ce: MintedCollection) => ce.available > 0)
+    this.collections = collectionEntities
   }
 
   @Watch('accountId', { immediate: true })
diff --git a/components/spotlight/SpotlightDetail.vue b/components/spotlight/SpotlightDetail.vue
index d653e68a5f..4a2c883a1b 100644
--- a/components/spotlight/SpotlightDetail.vue
+++ b/components/spotlight/SpotlightDetail.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, mixins, Watch } from 'nuxt-property-decorator'
+import { Component, Prop, Watch, mixins } from 'nuxt-property-decorator'
 import shouldUpdate from '@/utils/shouldUpdate'
 import PrefixMixin from '@/utils/mixins/prefixMixin'
 import nftSimpleListByAccount from '@/queries/nftSimpleListByAccount.graphql'
@@ -40,10 +40,10 @@ export default class SpotlightDetail extends mixins(PrefixMixin) {
     })
 
     const {
-      data: { nFTEntities },
+      data: { nftEntities },
     } = nfts
 
-    this.nfts = nFTEntities?.nodes || []
+    this.nfts = nftEntities || []
   }
 
   @Watch('account', { immediate: true })
diff --git a/components/unique/Gallery/Item/AvailableActions.vue b/components/unique/Gallery/Item/AvailableActions.vue
index 27a2eda7cd..0be8e47250 100644
--- a/components/unique/Gallery/Item/AvailableActions.vue
+++ b/components/unique/Gallery/Item/AvailableActions.vue
@@ -32,7 +32,7 @@
 
 <script lang="ts">
 import NFTUtils, { NFTAction } from '@/components/unique/NftUtils'
-import nftById from '@/queries/nftById.graphql'
+import nftById from '@/queries/subsquid/general/nftById.graphql'
 import RmrkVersionMixin from '@/utils/mixins/rmrkVersionMixin'
 import UseApiMixin from '@/utils/mixins/useApiMixin'
 import { notificationTypes, showNotification } from '@/utils/notification'
diff --git a/composables/usePrefix.ts b/composables/usePrefix.ts
index fdc6ac2371..1886b88fe3 100644
--- a/composables/usePrefix.ts
+++ b/composables/usePrefix.ts
@@ -28,7 +28,7 @@ export default function () {
   }
 
   const client = computed<string>(() => {
-    return urlPrefix.value === 'rmrk' ? 'subsquid' : urlPrefix.value
+    return urlPrefix.value
   })
 
   const tokenId = computed(() => getKusamaAssetId(urlPrefix.value))
diff --git a/queries/collectionByAccountWithTokens.graphql b/queries/collectionByAccountWithTokens.graphql
index 8613af23f4..38078247d2 100644
--- a/queries/collectionByAccountWithTokens.graphql
+++ b/queries/collectionByAccountWithTokens.graphql
@@ -1,26 +1,17 @@
 query collectionByAccountWithTokens($account: String!) {
-  collectionEntities(
-    filter: { currentOwner: { equalTo: $account } }
-    orderBy: BLOCK_NUMBER_DESC
-  ) {
-    nodes {
+  collectionEntities(where: {currentOwner_eq: $account supply_gt: 0}, orderBy: blockNumber_DESC) {
+    id
+    name
+    max
+    metadata
+    symbol
+    nftCount
+    available: supply
+    nfts(where: {currentOwner_eq: $account, burned_eq: false}) {
       id
-      name
-      max
-      metadata
-      symbol
-      nfts(
-        filter: {
-          currentOwner: { equalTo: $account }
-          burned: { distinctFrom: true }
-        }
-      ) {
-        totalCount
-        nodes {
-          id
-          price
-        }
-      }
+      price
+      burned
     }
   }
 }
+
diff --git a/queries/collectionById.graphql b/queries/collectionById.graphql
deleted file mode 100644
index 567bc70375..0000000000
--- a/queries/collectionById.graphql
+++ /dev/null
@@ -1,33 +0,0 @@
-#import "./fragments/collection.graphql"
-#import "./fragments/collectionDetails.graphql"
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query collectionById(
-  $id: String!
-  $search: [NFTEntityFilter!]
-  $orderBy: NftEntitiesOrderBy = BLOCK_NUMBER_DESC
-  $first: Int!
-  $offset: Int
-) {
-  collectionEntity(id: $id) {
-    ...collection
-    ...collectionDetails
-    createdAt
-    nfts(
-      orderBy: [$orderBy, BLOCK_NUMBER_DESC]
-      first: $first
-      offset: $offset
-      filter: { burned: { distinctFrom: true }, and: $search }
-    ) {
-      totalCount
-      nodes {
-        ...nft
-        ...nftDetails
-        emotes {
-          totalCount
-        }
-      }
-    }
-  }
-}
diff --git a/queries/collectionForMint.graphql b/queries/collectionForMint.graphql
deleted file mode 100644
index af2bae6a06..0000000000
--- a/queries/collectionForMint.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-query collectionForMint($account: String!) {
-  collectionEntities(
-    filter: { currentOwner: { equalTo: $account } }
-    orderBy: BLOCK_NUMBER_DESC
-  ) {
-    nodes {
-      id
-      name
-      max
-      metadata
-      symbol
-      nfts {
-        totalCount
-        nodes {
-          id
-          burned
-        }
-      }
-    }
-  }
-}
diff --git a/queries/collectionIssuerList.graphql b/queries/collectionIssuerList.graphql
deleted file mode 100644
index b7c030734e..0000000000
--- a/queries/collectionIssuerList.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-query collectionIssuerList($denyList: [String!]) {
-  collectionEntities(filter: { issuer: { notIn: $denyList } }) {
-    nodes {
-      issuer
-      nfts(filter: { burned: { distinctFrom: true } }) {
-        totalCount
-        nodes {
-          issuer
-          currentOwner
-          metadata
-          price
-          events
-        }
-      }
-    }
-  }
-}
diff --git a/queries/collectionListByAccount.graphql b/queries/collectionListByAccount.graphql
deleted file mode 100644
index 83a569a7ab..0000000000
--- a/queries/collectionListByAccount.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-#import "./fragments/collection.graphql"
-#import "./fragments/collectionDetails.graphql"
-
-query collectionListByAccount($account: String!, $first: Int!, $offset: Int) {
-  collectionEntities(
-    filter: { issuer: { equalTo: $account }, id: { notLike: "%KAN" } }
-    orderBy: BLOCK_NUMBER_DESC
-    first: $first
-    offset: $offset
-  ) {
-    totalCount
-    nodes {
-      ...collection
-      ...collectionDetails
-    }
-  }
-}
diff --git a/queries/collectionListWithSearch.graphql b/queries/collectionListWithSearch.graphql
deleted file mode 100644
index 252520de52..0000000000
--- a/queries/collectionListWithSearch.graphql
+++ /dev/null
@@ -1,33 +0,0 @@
-#import "./fragments/collection.graphql"
-#import "./fragments/collectionDetails.graphql"
-
-query collectionListWithSearch(
-  $first: Int!
-  $offset: Int
-  $search: [CollectionEntityFilter!]
-  $listed: [NFTEntityFilter!]
-  $orderBy: [CollectionEntitiesOrderBy!] = [BLOCK_NUMBER_DESC]
-) {
-  collectionEntities(
-    orderBy: $orderBy
-    first: $first
-    offset: $offset
-    filter: { id: { notLike: "%KAN%" }, and: $search }
-  ) {
-    totalCount
-    nodes {
-      ...collection
-      ...collectionDetails
-      nfts(filter: { burned: { distinctFrom: true }, and: $listed }) {
-        nodes {
-          id
-          metadata
-          name
-          price
-          burned
-          currentOwner
-        }
-      }
-    }
-  }
-}
diff --git a/queries/collectionNftEventListById.graphql b/queries/collectionNftEventListById.graphql
deleted file mode 100644
index 1f6b475f4f..0000000000
--- a/queries/collectionNftEventListById.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-query collectionNftEventListById($id: String!) {
-  collection: collectionEntity(id: $id) {
-    id
-    nfts(filter: { burned: { distinctFrom: true }}) {
-      nodes {
-        events
-      }
-    }
-  }
-}
diff --git a/queries/collectionSeriesList.graphql b/queries/collectionSeriesList.graphql
deleted file mode 100644
index 9c1100a1a5..0000000000
--- a/queries/collectionSeriesList.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-#import "./fragments/collection.graphql"
-#import "./fragments/collectionDetails.graphql"
-
-query collectionSeriesList($denyList: [String!]) {
-  collectionEntities(filter: { issuer: { notIn: $denyList } }) {
-    nodes {
-      issuer
-      nfts(filter: { burned: { distinctFrom: true } }) {
-        totalCount
-        nodes {
-          issuer
-          currentOwner
-          metadata
-          price
-          events
-        }
-      }
-      ...collection
-      ...collectionDetails
-    }
-  }
-}
diff --git a/queries/collectionStatsById.graphql b/queries/collectionStatsById.graphql
deleted file mode 100644
index 51b73d5cfb..0000000000
--- a/queries/collectionStatsById.graphql
+++ /dev/null
@@ -1,26 +0,0 @@
-query collectionStatsById($id: String!) {
-  stats: collectionEntity(id: $id) {
-    id
-    base: nfts {
-      count: totalCount
-      nfts: nodes {
-        currentOwner
-        events
-      }
-      aggregates {
-        distinctCount {
-          currentOwner
-        }
-      }
-    }
-    listed: nfts(filter: { price: { greaterThan: "0" } }) {
-      count: totalCount
-      aggregates {
-        floor: min {
-          value: price
-        }
-      }
-    }
-
-  }
-}
diff --git a/queries/firstNftByIssuer.graphql b/queries/firstNftByIssuer.graphql
deleted file mode 100644
index 8befbc6587..0000000000
--- a/queries/firstNftByIssuer.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-query firstNftByIssuer($account: String!) {
-  nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-    }
-    orderBy: BLOCK_NUMBER_DESC
-    first: 1
-  ) {
-    nodes {
-      metadata
-    }
-  }
-}
diff --git a/queries/mintedCollectionListByAccount.graphql b/queries/mintedCollectionListByAccount.graphql
deleted file mode 100644
index 404b35c8b6..0000000000
--- a/queries/mintedCollectionListByAccount.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-query mintedCollectionListByAccount($account: String!) {
-  collectionEntities(
-    filter: { issuer: { equalTo: $account } }
-    orderBy: NAME_ASC
-  ) {
-    totalCount
-    nodes {
-      id
-      name
-      symbol
-    }
-  }
-}
diff --git a/queries/nftById.graphql b/queries/nftById.graphql
deleted file mode 100644
index d54f208d03..0000000000
--- a/queries/nftById.graphql
+++ /dev/null
@@ -1,20 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nftById($id: String!) {
-  nFTEntity(id: $id) {
-    ...nft
-    ...nftDetails
-    collection {
-      id
-      name
-    }
-    emotes {
-      nodes {
-        caller
-        value
-      }
-    }
-    events
-  }
-}
diff --git a/queries/nftByIdMinimal.graphql b/queries/nftByIdMinimal.graphql
deleted file mode 100644
index 8a2c189b4c..0000000000
--- a/queries/nftByIdMinimal.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query nftByIdMinimal($id: String!) {
-  nft: nFTEntity(id: $id) {
-    id
-    currentOwner
-    price
-    events
-  }
-}
diff --git a/queries/nftIdListByCollection.graphql b/queries/nftIdListByCollection.graphql
deleted file mode 100644
index 123e1923fc..0000000000
--- a/queries/nftIdListByCollection.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-query nftListByCollection($id: String!) {
-  nftEntities: nFTEntities(
-    filter: { collectionId: { equalTo: $id }, burned: { distinctFrom: true } }
-  ) {
-    nodes {
-      id
-    }
-  }
-}
diff --git a/queries/nftList.graphql b/queries/nftList.graphql
deleted file mode 100644
index d87ba656fc..0000000000
--- a/queries/nftList.graphql
+++ /dev/null
@@ -1,20 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nfts($first: Int!, $offset: Int) {
-  nFTEntities(
-    orderBy: BLOCK_NUMBER_DESC
-    first: $first
-    offset: $offset
-    filter: { name: { notLike: "%Kanaria%" } }
-  ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-      emotes {
-        totalCount
-      }
-    }
-  }
-}
diff --git a/queries/nftListByAccount.graphql b/queries/nftListByAccount.graphql
deleted file mode 100644
index 0febeae67c..0000000000
--- a/queries/nftListByAccount.graphql
+++ /dev/null
@@ -1,20 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nftListByAccount($account: String!, $first: Int!, $offset: Int) {
-  nFTEntities(
-    filter: {
-      currentOwner: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-    }
-    orderBy: BLOCK_NUMBER_DESC
-    first: $first
-    offset: $offset
-  ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-    }
-  }
-}
diff --git a/queries/nftListByCollection.graphql b/queries/nftListByCollection.graphql
deleted file mode 100644
index 291ec2197f..0000000000
--- a/queries/nftListByCollection.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-query nftListByCollection($id: String!) {
-  nFTEntities(
-    filter: { collectionId: { equalTo: $id }, burned: { distinctFrom: true } }
-  ) {
-    nodes {
-      id
-      currentOwner
-      issuer
-      price
-      events
-    }
-  }
-}
diff --git a/queries/nftListByIssuer.graphql b/queries/nftListByIssuer.graphql
deleted file mode 100644
index 605a48caaa..0000000000
--- a/queries/nftListByIssuer.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nftListByIssuer(
-  $account: String!
-  $first: Int!
-  $offset: Int
-  $search: [NFTEntityFilter!]
-  $orderBy: NftEntitiesOrderBy = BLOCK_NUMBER_DESC
-) {
-  nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-      and: $search
-    }
-    orderBy: [$orderBy, BLOCK_NUMBER_DESC]
-    first: $first
-    offset: $offset
-  ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-      emotes {
-        totalCount
-      }
-    }
-  }
-}
diff --git a/queries/nftListByIssuerAndOwner.graphql b/queries/nftListByIssuerAndOwner.graphql
deleted file mode 100644
index f1d6735040..0000000000
--- a/queries/nftListByIssuerAndOwner.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-query nftListByIssuerAndOwner(
-  $account: String!
-  $currentOwner: String!
-) {
-  nftList: nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      currentOwner: { equalTo: $currentOwner }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-    }
-  ) {
-    totalCount
-  }
-}
diff --git a/queries/nftListCollected.graphql b/queries/nftListCollected.graphql
deleted file mode 100644
index 82fcf651ae..0000000000
--- a/queries/nftListCollected.graphql
+++ /dev/null
@@ -1,33 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nftListCollected(
-  $account: String!
-  $first: Int!
-  $offset: Int
-  $orderBy: NftEntitiesOrderBy = BLOCK_NUMBER_DESC
-  $search: [NFTEntityFilter!]
-) {
-  nFTEntities(
-    filter: {
-      issuer: { notEqualTo: $account }
-      currentOwner: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-      and: $search
-    }
-    orderBy: [$orderBy, BLOCK_NUMBER_DESC]
-    first: $first
-    offset: $offset
-  ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-      emotes {
-        totalCount
-      }
-      createdAt
-    }
-  }
-}
diff --git a/queries/nftListSold.graphql b/queries/nftListSold.graphql
deleted file mode 100644
index e3aeb5f9f5..0000000000
--- a/queries/nftListSold.graphql
+++ /dev/null
@@ -1,32 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nftListSold(
-  $account: String!
-  $first: Int!
-  $offset: Int
-  $orderBy: NftEntitiesOrderBy = BLOCK_NUMBER_DESC
-  $search: [NFTEntityFilter!]
-) {
-  nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      currentOwner: { notEqualTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-      and: $search
-    }
-    orderBy: [$orderBy, BLOCK_NUMBER_DESC]
-    first: $first
-    offset: $offset
-  ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-      emotes {
-        totalCount
-      }
-    }
-  }
-}
diff --git a/queries/nftListWithSearch.graphql b/queries/nftListWithSearch.graphql
deleted file mode 100644
index 93cf0b5b5a..0000000000
--- a/queries/nftListWithSearch.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-#import "./fragments/nft.graphql"
-#import "./fragments/nftDetails.graphql"
-
-query nftListWithSearch(
-  $first: Int!
-  $offset: Int
-  $denyList: [String!]
-  $search: [NFTEntityFilter!]
-  $orderBy: [NftEntitiesOrderBy!] = [BLOCK_NUMBER_DESC]
-) {
-  nFTEntities(
-    orderBy: $orderBy
-    first: $first
-    offset: $offset
-    filter: {
-      burned: { distinctFrom: true }
-      name: { notLike: "%Kanaria%" }
-      issuer: { notIn: $denyList }
-      and: $search
-    }
-  ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-      emotes {
-        totalCount
-      }
-    }
-  }
-}
diff --git a/queries/nftMetaList.graphql b/queries/nftMetaList.graphql
deleted file mode 100644
index 87d7876e65..0000000000
--- a/queries/nftMetaList.graphql
+++ /dev/null
@@ -1,13 +0,0 @@
-query nftMetaList($first: Int!, $offset: Int) {
-  nFTEntities(
-    orderBy: BLOCK_NUMBER_DESC
-    first: $first
-    offset: $offset
-    filter: { name: { notLike: "%Kanaria%" } }
-  ) {
-    totalCount
-    nodes {
-      metadata
-    }
-  }
-}
diff --git a/queries/nftMetaListWithSearch.graphql b/queries/nftMetaListWithSearch.graphql
deleted file mode 100644
index 866f77c900..0000000000
--- a/queries/nftMetaListWithSearch.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-query nftMetaListWithSearch(
-  $first: Int!
-  $offset: Int
-  $search: [NFTEntityFilter!]
-) {
-  nFTEntities(
-    orderBy: BLOCK_NUMBER_DESC
-    first: $first
-    offset: $offset
-    filter: { name: { notLike: "%Kanaria%" }, and: $search }
-  ) {
-    totalCount
-    nodes {
-      metadata
-    }
-  }
-}
diff --git a/queries/nftSimpleListByAccount.graphql b/queries/nftSimpleListByAccount.graphql
index d04740d241..14b97b7625 100644
--- a/queries/nftSimpleListByAccount.graphql
+++ b/queries/nftSimpleListByAccount.graphql
@@ -2,15 +2,12 @@
 #import "./fragments/nftDetails.graphql"
 
 query nftSimpleListByAccount($account: String!, $first: Int!) {
-  nFTEntities(
-    filter: { issuer: { equalTo: $account }, name: { notLike: "%Kanaria%" } }
-    orderBy: BLOCK_NUMBER_DESC
-    first: $first
+  nftEntities(
+    where: { issuer_eq: $account, name_not_contains: "kanaria" }
+    orderBy: blockNumber_DESC
+    limit: $first
   ) {
-    totalCount
-    nodes {
-      ...nft
-      ...nftDetails
-    }
+    ...nft
+    ...nftDetails
   }
 }
diff --git a/queries/nftStatsByIssuer.graphql b/queries/nftStatsByIssuer.graphql
deleted file mode 100644
index 9898e0a0f7..0000000000
--- a/queries/nftStatsByIssuer.graphql
+++ /dev/null
@@ -1,56 +0,0 @@
-query nFTStatsByIssuer($account: String!) {
-  firstMint: nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-    }
-    orderBy: BLOCK_NUMBER_ASC
-    first: 1
-  ) {
-    nodes {
-      collection {
-        createdAt
-      }
-    }
-  }
-
-  nFTCreated: nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-    }
-  ) {
-    totalCount
-  }
-
-  nFTCollected: nFTEntities(
-    filter: {
-      issuer: { notEqualTo: $account }
-      currentOwner: { equalTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-    }
-    orderBy: BLOCK_NUMBER_DESC
-    first: 1
-  ) {
-      nodes {
-      collection {
-        createdAt
-      }
-    }
-    totalCount
-  }
-
-  nFTSold: nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      currentOwner: { notEqualTo: $account }
-      name: { notLike: "%Kanaria%" }
-      burned: { distinctFrom: true }
-    }
-  ) {
-    totalCount
-  }
-}
diff --git a/queries/simpleNft.graphql b/queries/simpleNft.graphql
deleted file mode 100644
index f968f50d87..0000000000
--- a/queries/simpleNft.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-fragment simpleNft on NFTEntity {
-  id
-  name
-  metadata
-  burned
-}
diff --git a/queries/unique/collectionCuratedList.graphql b/queries/unique/collectionCuratedList.graphql
deleted file mode 100644
index 9b636b3623..0000000000
--- a/queries/unique/collectionCuratedList.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-#import "../fragments/collection.graphql"
-
-query collectionCuratedList {
-  collectionEntities(orderBy: BLOCK_NUMBER_DESC, first: 5) {
-    nodes {
-	  ...collection
-    }
-  }
-}
diff --git a/queries/userStatsByAccount.graphql b/queries/userStatsByAccount.graphql
deleted file mode 100644
index 1e2e7cb840..0000000000
--- a/queries/userStatsByAccount.graphql
+++ /dev/null
@@ -1,40 +0,0 @@
-query userStatsByAccount($account: String!) {
-  firstMint: collectionEntities(
-    filter: { issuer: { equalTo: $account } }
-    orderBy: CREATED_AT_ASC
-    first: 1
-  ) {
-    nodes {
-      id
-      createdAt
-    }
-  }
-
-  created: nFTEntities(
-    filter: { issuer: { equalTo: $account }, burned: { distinctFrom: true } }
-  ) {
-    totalCount
-  }
-
-  collected: nFTEntities(
-    filter: {
-      issuer: { notEqualTo: $account }
-      currentOwner: { equalTo: $account }
-      burned: { distinctFrom: true }
-    }
-    orderBy: BLOCK_NUMBER_DESC
-    first: 1
-  ) {
-    totalCount
-  }
-
-  sold: nFTEntities(
-    filter: {
-      issuer: { equalTo: $account }
-      currentOwner: { notEqualTo: $account }
-      burned: { distinctFrom: true }
-    }
-  ) {
-    totalCount
-  }
-}
diff --git a/utils/mixins/prefixMixin.ts b/utils/mixins/prefixMixin.ts
index 31a152d89b..176e970c20 100644
--- a/utils/mixins/prefixMixin.ts
+++ b/utils/mixins/prefixMixin.ts
@@ -13,7 +13,7 @@ export default class PrefixMixin extends Vue {
   }
 
   get client(): string {
-    return this.urlPrefix === 'rmrk' ? 'subsquid' : this.urlPrefix
+    return this.urlPrefix
   }
 
   get isMoonriver(): boolean {
diff --git a/utils/prefix.ts b/utils/prefix.ts
index 3f4cb98864..b528da046e 100644
--- a/utils/prefix.ts
+++ b/utils/prefix.ts
@@ -20,20 +20,6 @@ export function isRemark(prefix: string): boolean {
   return prefix === 'rmrk'
 }
 
-export function getSupportedClient(prefix: string): 'subquery' | 'subsquid' {
-  switch (prefix) {
-    case 'statemine':
-    case 'westmint':
-    case 'rmrk':
-      return 'subquery'
-    case 'bsx':
-    case 'snek':
-      return 'subsquid'
-    default:
-      return 'subsquid'
-  }
-}
-
 export function prefixBuildOnText(prefix: string): string {
   switch (prefix) {
     case 'bsx':
diff --git a/utils/queryPathResolver.ts b/utils/queryPathResolver.ts
index a7e8e34925..302cac33d9 100644
--- a/utils/queryPathResolver.ts
+++ b/utils/queryPathResolver.ts
@@ -8,16 +8,6 @@ function resolveQueryPath(
 
 function getPath(prefix: string) {
   switch (prefix) {
-    case 'rmrk':
-      return ''
-    case 'bsx':
-    case 'movr':
-    case 'glmr':
-    case 'snek':
-    case 'subsquid':
-    case 'ksm':
-      return 'subsquid/general/'
-    case 'statemine':
     case 'westmint':
       return 'unique/'
     case 'chain-bsx':
@@ -27,20 +17,8 @@ function getPath(prefix: string) {
     case 'chain-ksm':
       return 'subsquid/ksm/'
     default:
-      return ''
+      return 'subsquid/general/'
   }
 }
 
-// const queryPaths: Record<string, { subsquid: string, subquery: string | undefined }> = {
-//   'rmrk': {
-//     subsquid: 'subsquid/general/',
-//     subquery: '',
-//   },
-//   'bsx': {
-//     subsquid: 'subsquid/general/',
-//     subquery: undefined,
-//   }
-
-// }
-
 export default resolveQueryPath
diff --git a/utils/uniquery.ts b/utils/uniquery.ts
index d1f48e2dd1..2c3d03e633 100644
--- a/utils/uniquery.ts
+++ b/utils/uniquery.ts
@@ -34,7 +34,7 @@ export function unwrapId(
 }
 
 export function correctPrefix(prefix: string): string {
-  return prefix === 'rmrk' ? 'subsquid' : prefix
+  return prefix
 }
 
 export function ifRMRK<T>(prefix: string, first: T, second: T): T {