diff --git a/kernel/include/timeout_q.h b/kernel/include/timeout_q.h
index 3c878444248c..e911a7dba57e 100644
--- a/kernel/include/timeout_q.h
+++ b/kernel/include/timeout_q.h
@@ -109,10 +109,9 @@ static inline void _handle_one_expired_timeout(struct _timeout *timeout)
 
 static inline void _handle_expired_timeouts(sys_dlist_t *expired)
 {
-	struct _timeout *timeout, *next;
+	struct _timeout *timeout;
 
-	SYS_DLIST_FOR_EACH_CONTAINER_SAFE(expired, timeout, next, node) {
-		sys_dlist_remove(&timeout->node);
+	SYS_DLIST_FOR_EACH_CONTAINER(expired, timeout, node) {
 		_handle_one_expired_timeout(timeout);
 	}
 }
diff --git a/kernel/sys_clock.c b/kernel/sys_clock.c
index 8952c2eaf080..fc2bef985943 100644
--- a/kernel/sys_clock.c
+++ b/kernel/sys_clock.c
@@ -167,8 +167,6 @@ u32_t k_uptime_delta_32(s64_t *reftime)
  * interrupt.
  */
 
-volatile int _handling_timeouts;
-
 static inline void handle_timeouts(s32_t ticks)
 {
 	sys_dlist_t expired;
@@ -198,8 +196,6 @@ static inline void handle_timeouts(s32_t ticks)
 	 * prohibited.
 	 */
 
-	_handling_timeouts = 1;
-
 	while (next) {
 
 		/*
@@ -254,8 +250,6 @@ static inline void handle_timeouts(s32_t ticks)
 	irq_unlock(key);
 
 	_handle_expired_timeouts(&expired);
-
-	_handling_timeouts = 0;
 }
 #else
 	#define handle_timeouts(ticks) do { } while ((0))