diff --git a/src/fixtures/pvm.ts b/src/fixtures/pvm.ts
index 7e998b1c8..a11efed35 100644
--- a/src/fixtures/pvm.ts
+++ b/src/fixtures/pvm.ts
@@ -307,14 +307,9 @@ export const transformSubnetTxBytes = () =>
 
 export const convertSubnetValidator = () =>
   new ConvertSubnetValidator(
-    // nodeId(),
     bytes(),
     bigIntPr(),
     bigIntPr(),
-
-    // signer(),
-    // outputOwner(),
-    // outputOwner(),
     proofOfPossession(),
     pChainOwner(),
     pChainOwner(),
@@ -322,18 +317,9 @@ export const convertSubnetValidator = () =>
 
 export const convertSubnetValidatorBytes = () =>
   concatBytes(
-    // nodeIdBytes(),
     bytesBytes(),
     bigIntPrBytes(),
     bigIntPrBytes(),
-
-    // bytesForInt(28),
-    // signerBytes(),
-    // bytesForInt(11),
-    // outputOwnerBytes(),
-    // bytesForInt(11),
-    // outputOwnerBytes(),
-
     proofOfPossessionBytes(),
     pChainOwnerBytes(),
     pChainOwnerBytes(),
@@ -344,7 +330,6 @@ export const convertSubnetTx = () =>
     baseTx(),
     id(),
     id(),
-    // address(),
     bytes(),
     makeList(convertSubnetValidator)(),
     input(),
@@ -355,7 +340,6 @@ export const convertSubnetTxBytes = () =>
     baseTxbytes(),
     idBytes(),
     idBytes(),
-    // addressBytes(),
     bytesBytes(),
     makeListBytes(convertSubnetValidatorBytes)(),
     bytesForInt(10),
diff --git a/src/vms/pvm/etna-builder/builder.ts b/src/vms/pvm/etna-builder/builder.ts
index ce04eaf66..ee526635d 100644
--- a/src/vms/pvm/etna-builder/builder.ts
+++ b/src/vms/pvm/etna-builder/builder.ts
@@ -1433,7 +1433,6 @@ export const newConvertSubnetTx: TxBuilderFn<NewConvertSubnetTxProps> = (
       ),
       Id.fromString(subnetId),
       Id.fromString(chainId),
-      // new Address(address),
       new Bytes(address),
       sortedValidators,
       Input.fromNative(subnetAuth),
diff --git a/src/vms/pvm/txs/fee/complexity.test.ts b/src/vms/pvm/txs/fee/complexity.test.ts
index a80cd9c56..396fa2350 100644
--- a/src/vms/pvm/txs/fee/complexity.test.ts
+++ b/src/vms/pvm/txs/fee/complexity.test.ts
@@ -282,7 +282,6 @@ describe('Complexity', () => {
 
   describe('getConvertSubnetValidatorComplexity', () => {
     test('any can spend', () => {
-      // const pChainOwner = OutputOwners.fromNative([], 0n, 1);
       const pChainOwner = PChainOwner.fromNative([], 1);
       const validator = ConvertSubnetValidator.fromNative(
         'NodeID-MqgFXT8JhorbEW2LpTDGePBBhv55SSp3M',
@@ -304,15 +303,6 @@ describe('Complexity', () => {
       );
     });
     test('single remaining balance owner', () => {
-      // const remainingBalanceOwner = OutputOwners.fromNative(
-      //   [
-      //     utils.bech32ToBytes(
-      //       'P-custom1p8ddr5wfmfq0zv3n2wnst0cm2pfccaudm3wsrs',
-      //     ),
-      //   ],
-      //   0n,
-      //   1,
-      // );
       const remainingBalanceOwner = PChainOwner.fromNative(
         [
           utils.bech32ToBytes(
@@ -321,7 +311,6 @@ describe('Complexity', () => {
         ],
         1,
       );
-      // const deactivationOwner = OutputOwners.fromNative([], 0n, 1);
       const deactivationOwner = PChainOwner.fromNative([], 1);
       const validator = ConvertSubnetValidator.fromNative(
         'NodeID-MqgFXT8JhorbEW2LpTDGePBBhv55SSp3M',
@@ -343,15 +332,6 @@ describe('Complexity', () => {
       );
     });
     test('single deactivation owner', () => {
-      // const deactivationOwner = OutputOwners.fromNative(
-      //   [
-      //     utils.bech32ToBytes(
-      //       'P-custom1p8ddr5wfmfq0zv3n2wnst0cm2pfccaudm3wsrs',
-      //     ),
-      //   ],
-      //   0n,
-      //   1,
-      // );
       const deactivationOwner = PChainOwner.fromNative(
         [
           utils.bech32ToBytes(
@@ -360,7 +340,6 @@ describe('Complexity', () => {
         ],
         1,
       );
-      // const remainingBalanceOwner = OutputOwners.fromNative([], 0n, 1);
       const remainingBalanceOwner = PChainOwner.fromNative([], 1);
       const validator = ConvertSubnetValidator.fromNative(
         'NodeID-MqgFXT8JhorbEW2LpTDGePBBhv55SSp3M',
@@ -382,15 +361,6 @@ describe('Complexity', () => {
       );
     });
     test('remaining balance owner and deactivation owner', () => {
-      // const pChainOwner = OutputOwners.fromNative(
-      //   [
-      //     utils.bech32ToBytes(
-      //       'P-custom1p8ddr5wfmfq0zv3n2wnst0cm2pfccaudm3wsrs',
-      //     ),
-      //   ],
-      //   0n,
-      //   1,
-      // );
       const pChainOwner = PChainOwner.fromNative(
         [
           utils.bech32ToBytes(