diff --git a/CHANGELOG.md b/CHANGELOG.md
index e44caf158..f8d60ea69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,6 @@ Releases prior to 7.0 has been removed from this file to declutter search result
 
 - cli: Fixed help message on `CallbackError` reporting `batch` handler instead of actual one.
 - substrate.subsquid: Fixed parsing nested structures in response.
-- substrate.subsquid: Fixed data parsing for `__kind=GeneralKey`.
 
 ### Changed
 
diff --git a/src/dipdup/fields.py b/src/dipdup/fields.py
index 8438c6e8c..be1f6d079 100644
--- a/src/dipdup/fields.py
+++ b/src/dipdup/fields.py
@@ -41,7 +41,6 @@
 from tortoise.fields.relational import ManyToManyFieldInstance as ManyToManyFieldInstance
 from tortoise.fields.relational import ManyToManyRelation as ManyToManyRelation
 from tortoise.fields.relational import OneToOneField as OneToOneField
-from tortoise.fields.relational import OneToOneFieldInstance as OneToOneFieldInstance
 from tortoise.fields.relational import OneToOneNullableRelation as OneToOneNullableRelation
 from tortoise.fields.relational import OneToOneRelation as OneToOneRelation
 from tortoise.fields.relational import ReverseRelation as ReverseRelation
diff --git a/src/dipdup/runtimes.py b/src/dipdup/runtimes.py
index 3c477c2bb..deb2a7106 100644
--- a/src/dipdup/runtimes.py
+++ b/src/dipdup/runtimes.py
@@ -289,16 +289,6 @@ def extract_subsquid_payload(data: Any) -> Any:
         if 'key' in data:
             return {kind: data['key']}
 
-        # See: https://github.com/galacticcouncil/hydration-node/blob/master/precompiles/utils/src/solidity/codec/xcm.rs#L294
-        if (
-            'data' in data and
-            'length' in data and
-            isinstance(data['data'], str) and
-            data['data'].startswith('0x') and
-            isinstance(data['length'], int)
-        ):
-            return {kind: data['data'][:2+data['length']*2]}
-
         return kind
 
     return data