diff --git a/ibc-core/ics24-host/src/context.rs b/ibc-core/ics24-host/src/context.rs
index b390d6b83..612768a32 100644
--- a/ibc-core/ics24-host/src/context.rs
+++ b/ibc-core/ics24-host/src/context.rs
@@ -151,7 +151,6 @@ pub trait ExecutionContext: ValidationContext {
 
     /// Called upon client creation.
     /// Increases the counter which keeps track of how many clients have been created.
-    /// Should never fail.
     fn increase_client_counter(&mut self) -> Result<(), ContextError>;
 
     /// Stores the given connection_end at path
@@ -170,7 +169,6 @@ pub trait ExecutionContext: ValidationContext {
 
     /// Called upon connection identifier creation (Init or Try process).
     /// Increases the counter which keeps track of how many connections have been created.
-    /// Should never fail.
     fn increase_connection_counter(&mut self) -> Result<(), ContextError>;
 
     /// Stores the given packet commitment at the given store path
@@ -233,7 +231,6 @@ pub trait ExecutionContext: ValidationContext {
 
     /// Called upon channel identifier creation (Init or Try message processing).
     /// Increases the counter which keeps track of how many channels have been created.
-    /// Should never fail.
     fn increase_channel_counter(&mut self) -> Result<(), ContextError>;
 
     /// Emit the given IBC event
diff --git a/ibc-testkit/src/testapp/ibc/core/core_ctx.rs b/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
index 4d5628e14..386a83efb 100644
--- a/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
+++ b/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
@@ -648,7 +648,6 @@ where
 
     /// Called upon client creation.
     /// Increases the counter which keeps track of how many clients have been created.
-    /// Should never fail.
     fn increase_client_counter(&mut self) -> Result<(), ContextError> {
         let current_sequence = self
             .client_counter
@@ -701,7 +700,6 @@ where
 
     /// Called upon connection identifier creation (Init or Try process).
     /// Increases the counter which keeps track of how many connections have been created.
-    /// Should never fail.
     fn increase_connection_counter(&mut self) -> Result<(), ContextError> {
         let current_sequence = self
             .conn_counter