diff --git a/src/database.c b/src/database.c
index 1a926f507..8269691cb 100644
--- a/src/database.c
+++ b/src/database.c
@@ -393,19 +393,16 @@ void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_d
 int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state expect_state, int qos)
 {
 	struct mosquitto_client_msg *tail, *tmp;
-	int msg_index = 0;
 
 	if(!context) return MOSQ_ERR_INVAL;
 
 	DL_FOREACH_SAFE(context->msgs_out.inflight, tail, tmp){
-		msg_index++;
 		if(tail->mid == mid){
 			if(tail->qos != qos){
 				return MOSQ_ERR_PROTOCOL;
 			}else if(qos == 2 && tail->state != expect_state){
 				return MOSQ_ERR_PROTOCOL;
 			}
-			msg_index--;
 			db__message_remove_from_inflight(&context->msgs_out, tail);
 			break;
 		}
@@ -416,7 +413,6 @@ int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mo
 			break;
 		}
 
-		msg_index++;
 		tail->timestamp = db.now_s;
 		switch(tail->qos){
 			case 0:
@@ -986,14 +982,12 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 	int retain;
 	char *topic;
 	char *source_id;
-	int msg_index = 0;
 	bool deleted = false;
 	int rc;
 
 	if(!context) return MOSQ_ERR_INVAL;
 
 	DL_FOREACH_SAFE(context->msgs_in.inflight, tail, tmp){
-		msg_index++;
 		if(tail->mid == mid){
 			if(tail->store->qos != 2){
 				return MOSQ_ERR_PROTOCOL;
@@ -1026,7 +1020,6 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 			break;
 		}
 
-		msg_index++;
 		tail->timestamp = db.now_s;
 
 		if(tail->qos == 2){