diff --git a/main/lock.c b/main/lock.c
index 0af736f7db611d617171d2555e0a34a236dcab02..d66e01b27338e882cd92e22a8affb6367d29a5e9 100644
--- a/main/lock.c
+++ b/main/lock.c
@@ -311,7 +311,6 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
 	}
 #endif /* DEBUG_THREADS */
 
-	ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
 	return res;
 }
 
@@ -418,7 +417,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
 			__ast_mutex_logger("%s line %d (%s): Error: mutex '%s' is uninitialized and unable to initialize.\n",
 					 filename, lineno, func, mutex_name);
 		}
-		ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
 		return res;
 	}
 #endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
@@ -479,7 +477,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
 	}
 #endif /* DEBUG_THREADS */
 
-	ast_assert(res == 0);/*!< \todo BUGBUG Test to ensure that lock/unlock does not fail. */
 	return res;
 }
 
diff --git a/utils/ael_main.c b/utils/ael_main.c
index 96898e18f599c75df8cca0984ac818637e11c20e..b4245c8b45aac687d7ad0da140cb1d611243b569 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -37,12 +37,6 @@ void ast_register_file_version(const char *file, const char *version) { }
 void ast_unregister_file_version(const char *file) { }
 #endif
 
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function);
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function)
-{
-	/*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */
-}
-
 struct ast_flags ast_compat = { 7 };
 
 /*** MODULEINFO
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index fe3c9f30f042844054cef384bbc6c34b611299de..ef5225352ddac312a9a13b80391c0263c296bd74 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -80,12 +80,6 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 int option_debug = 0;
 int option_verbose = 0;
 
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function);
-void __ast_assert_failed(int condition, const char *condition_str, const char *file, int line, const char *function)
-{
-	/*! \todo BUGBUG Put here only to allow utils to compile in AST_DEVMODE */
-}
-
 void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)
 {