diff --git a/pallets/authority-members/src/lib.rs b/pallets/authority-members/src/lib.rs
index 78be54ef211abc8d2f5f4074714483e7706fff7a..6bd4e630203a0d0113ea8cef3b29df9daad50b4a 100644
--- a/pallets/authority-members/src/lib.rs
+++ b/pallets/authority-members/src/lib.rs
@@ -530,6 +530,7 @@ impl<T: Config> pallet_session::SessionManager<T::ValidatorId> for Pallet<T> {
         let members_ids_to_add = IncomingAuthorities::<T>::take();
         let members_ids_to_del = OutgoingAuthorities::<T>::take();
 
+        // TODO: what if we have outgoing members but no incoming ones?
         if members_ids_to_add.is_empty() {
             if members_ids_to_del.is_empty() {
                 // when no change to the set of autorities, return None
diff --git a/runtime/common/src/handlers.rs b/runtime/common/src/handlers.rs
index 8cb679c6680d6a74ac760d6a4556dc6744fbc4df..a8fbd18a56f9cf450e83aa37f86cbdca3da168c9 100644
--- a/runtime/common/src/handlers.rs
+++ b/runtime/common/src/handlers.rs
@@ -95,6 +95,7 @@ impl<
                 // user will have to claim authority membership
             }
             sp_membership::Event::MembershipRemoved(idty_index) => {
+                // TODO: recursive call? (see authority-members -> revoke_membership)
                 let call = pallet_authority_members::Call::<Runtime>::remove_member {
                     member_id: *idty_index,
                 };