diff --git a/pallets/duniter-wot/src/lib.rs b/pallets/duniter-wot/src/lib.rs
index 8927b0952f236effb9a2c36c061b62c5d39bb0b8..7a8a94e074dba99201a704411dae719f94857456 100644
--- a/pallets/duniter-wot/src/lib.rs
+++ b/pallets/duniter-wot/src/lib.rs
@@ -253,14 +253,14 @@ where
         match membership_event {
             sp_membership::Event::<IdtyIndex>::MembershipAdded(idty_index) => {
                 if !T::IsSubWot::get() {
-                    // when membership is acquired, validate identity
+                    // when main membership is acquired, tell identity
                     // (only used on first membership acquiry)
                     pallet_identity::Pallet::<T>::membership_added(*idty_index);
                 }
             }
             sp_membership::Event::<IdtyIndex>::MembershipRemoved(idty_index) => {
                 if !T::IsSubWot::get() {
-                    // when membership is lost, tell identity
+                    // when main membership is lost, tell identity
                     pallet_identity::Pallet::<T>::membership_removed(*idty_index);
                 }
             }
diff --git a/pallets/membership/src/tests.rs b/pallets/membership/src/tests.rs
index f0095154b42535691a9f8410d093ebd1eac8ea98..d3ea561676c7df75c9037da79ec8b5f2a47b232b 100644
--- a/pallets/membership/src/tests.rs
+++ b/pallets/membership/src/tests.rs
@@ -21,7 +21,6 @@ use frame_support::{assert_noop, assert_ok};
 use maplit::btreemap;
 use sp_membership::traits::*;
 use sp_membership::MembershipData;
-use sp_runtime::traits::IsMember;
 
 // alias
 type RtEvent = RuntimeEvent;
diff --git a/runtime/common/src/handlers.rs b/runtime/common/src/handlers.rs
index 0c8fd0b8e090994c8661fb5c080514e04cd41c1a..ae6132a757a83d2eb2c29d59cbe89ec97aae7873 100644
--- a/runtime/common/src/handlers.rs
+++ b/runtime/common/src/handlers.rs
@@ -125,7 +125,7 @@ where
         // TODO investigate why we should remove smith membership when removing authority member
         pallet_membership::Pallet::<Runtime, Instance2>::do_remove_membership(
             idty_index,
-            MembershipRemovalReason::System,
+            pallet_membership::MembershipRemovalReason::System,
         );
     }
 }
@@ -146,13 +146,13 @@ where
         if pallet_membership::Pallet::<Runtime, Instance2>::is_member(&idty_index) {
             pallet_membership::Pallet::<Runtime, Instance2>::do_remove_membership(
                 idty_index,
-                MembershipRemovalReason::System,
+                pallet_membership::MembershipRemovalReason::System,
             );
         }
         // Remove "classic" member
         pallet_membership::Pallet::<Runtime, Instance1>::do_remove_membership(
             idty_index,
-            MembershipRemovalReason::System,
+            pallet_membership::MembershipRemovalReason::System,
         );
 
         Weight::zero()
diff --git a/runtime/common/src/pallets_config.rs b/runtime/common/src/pallets_config.rs
index b958d0b59e9314c3f1d42d2d295e55b7cd25c176..74338942a06d44601c7af66b93b4b7358a86abfc 100644
--- a/runtime/common/src/pallets_config.rs
+++ b/runtime/common/src/pallets_config.rs
@@ -479,7 +479,7 @@ macro_rules! pallets_config {
             type IdtyNameValidator = IdtyNameValidatorImpl;
             type Signer = <Signature as sp_runtime::traits::Verify>::Signer;
 			type Signature = Signature;
-            type OnIdtyChange = (Wot, Quota, Account);
+            type OnIdtyChange = (Wot, SmithSubWot, Quota, Account);
             type RemoveIdentityConsumers = RemoveIdentityConsumersImpl<Self>;
             type RuntimeEvent = RuntimeEvent;
             type WeightInfo = common_runtime::weights::pallet_identity::WeightInfo<Runtime>;
diff --git a/runtime/gdev/tests/fixme_tests.rs b/runtime/gdev/tests/fixme_tests.rs
index 9bbdd6a2bbfa34d93b8f256877b6c144e071e5e5..028f23600ccebc7d1258815fb514717706143eaf 100644
--- a/runtime/gdev/tests/fixme_tests.rs
+++ b/runtime/gdev/tests/fixme_tests.rs
@@ -20,7 +20,8 @@
 mod common;
 
 use common::*;
-use frame_support::{assert_noop, assert_ok};
+// use frame_support::assert_ok;
+use frame_support::assert_noop;
 use gdev_runtime::*;
 use pallet_membership::MembershipRemovalReason;
 use sp_keyring::AccountKeyring;
@@ -42,14 +43,14 @@ fn can_still_issue_cert_when_membership_lost() {
         run_to_block(1);
 
         // expire Bob membership
-        assert_ok!(Membership::do_remove_membership(
-            2, // Bob
+        Membership::do_remove_membership(
+            2,
             MembershipRemovalReason::System
-        ));
+        );
         System::assert_has_event(RuntimeEvent::Membership(
             pallet_membership::Event::MembershipRemoved {
                 member: 2,
-                reason: MembershipRemovalReason::Expired,
+                reason: MembershipRemovalReason::System,
             },
         ));
 
diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs
index 5d74b29d7543f04ac5e880d9df2dc158ce8bd8b7..9221003c342a8e5c56f731808f0b3ea1c078ebc5 100644
--- a/runtime/gdev/tests/integration_tests.rs
+++ b/runtime/gdev/tests/integration_tests.rs
@@ -298,7 +298,7 @@ fn test_force_remove_identity() {
         System::assert_has_event(RuntimeEvent::Membership(
             pallet_membership::Event::MembershipRemoved {
                 member: 4,
-                reason: MembershipRemovalReason::Revoked,
+                reason: MembershipRemovalReason::System,
             },
         ));
         System::assert_has_event(RuntimeEvent::Identity(
@@ -530,7 +530,7 @@ fn test_remove_identity_after_one_ud() {
         System::assert_has_event(RuntimeEvent::Membership(
             pallet_membership::Event::MembershipRemoved {
                 member: 4,
-                reason: MembershipRemovalReason::Revoked,
+                reason: MembershipRemovalReason::System,
             },
         ));
         System::assert_has_event(RuntimeEvent::Identity(
@@ -572,10 +572,7 @@ fn test_ud_claimed_membership_on_and_off() {
 
         run_to_block(13);
         // alice identity expires
-        assert_ok!(Membership::do_remove_membership(
-            1,
-            MembershipRemovalReason::System
-        ));
+        Membership::do_remove_membership(1, MembershipRemovalReason::System);
         System::assert_has_event(RuntimeEvent::UniversalDividend(
             pallet_universal_dividend::Event::UdsAutoPaidAtRemoval {
                 count: 1,
@@ -668,7 +665,7 @@ fn test_remove_smith_identity() {
         System::assert_has_event(RuntimeEvent::SmithMembership(
             pallet_membership::Event::MembershipRemoved {
                 member: 3,
-                reason: MembershipRemovalReason::Revoked,
+                reason: MembershipRemovalReason::System,
             },
         ));
         System::assert_has_event(RuntimeEvent::AuthorityMembers(
@@ -677,7 +674,7 @@ fn test_remove_smith_identity() {
         System::assert_has_event(RuntimeEvent::Membership(
             pallet_membership::Event::MembershipRemoved {
                 member: 3,
-                reason: MembershipRemovalReason::Revoked,
+                reason: MembershipRemovalReason::System,
             },
         ));
         System::assert_has_event(RuntimeEvent::Identity(