diff --git a/src/alert-unified-alert.c b/src/alert-unified-alert.c
index 4da9ad5e79..535e3a7c28 100644
--- a/src/alert-unified-alert.c
+++ b/src/alert-unified-alert.c
@@ -317,8 +317,7 @@ int AlertUnifiedAlertOpenFileCtx(LogFileCtx *file_ctx, const char *prefix)
             strerror(errno));
         ret = -1;
     }
-    if (filename != NULL)
-        free(filename);
+
     return ret;
 }
 
@@ -367,7 +366,6 @@ static int AlertUnifiedAlertTestRotate01(void)
 error:
     AlertUnifiedAlertThreadDeinit(&tv, data);
     if (lf != NULL) LogFileFreeCtx(lf);
-    if (filename != NULL) free(filename);
     return r;
 }
 #endif /* UNITTESTS */
diff --git a/src/alert-unified-log.c b/src/alert-unified-log.c
index fc524a032e..be886ebb59 100644
--- a/src/alert-unified-log.c
+++ b/src/alert-unified-log.c
@@ -263,12 +263,7 @@ TmEcode AlertUnifiedLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 
 error:
-    /* clear memory */
-    if (aun != NULL) {
-        memset(aun, 0, sizeof(AlertUnifiedLogThread));
-        free(aun);
-    }
-    printf("AlertUnifiedLogThreadDeinit done (error)\n");
+
     return TM_ECODE_FAILED;
 }
 
@@ -338,8 +333,7 @@ int AlertUnifiedLogOpenFileCtx(LogFileCtx *file_ctx, const char *prefix)
             strerror(errno));
         ret = -1;
     }
-    if (filename != NULL)
-        free(filename);
+
     return ret;
 }
 
@@ -388,7 +382,6 @@ static int AlertUnifiedLogTestRotate01(void)
 error:
     AlertUnifiedLogThreadDeinit(&tv, data);
     if (lf != NULL) LogFileFreeCtx(lf);
-    if (filename != NULL) free(filename);
     return r;
 }
 #endif /* UNITTESTS */
diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index d0f284c945..52263936b5 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -604,8 +604,7 @@ int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, const char *prefix)
             strerror(errno));
         ret = -1;
     }
-    if (filename != NULL)
-        free(filename);
+
     return ret;
 }
 
diff --git a/src/detect-engine.c b/src/detect-engine.c
index b20133ff56..05d0a5eb2c 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -82,7 +82,7 @@ void DetectEngineCtxFree(DetectEngineCtx *de_ctx) {
         free(de_ctx->sig_array);
 
     if (de_ctx->class_conf_ht != NULL)
-        free(de_ctx->class_conf_ht);
+        HashTableFree(de_ctx->class_conf_ht);
     free(de_ctx);
     //DetectAddressGroupPrintMemory();
     //DetectSigGroupPrintMemory();
diff --git a/src/tm-modules.c b/src/tm-modules.c
index 731a765618..98f9da6597 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -79,6 +79,8 @@ int LogFileFreeCtx(LogFileCtx *lf_ctx)
         }
         if (lf_ctx->prefix != NULL)
             free(lf_ctx->prefix);
+        if(lf_ctx->filename != NULL)
+            free(lf_ctx->filename);
         free(lf_ctx);
         ret=1;
     }
diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 13953795a8..3c9fe9851f 100644
--- a/src/util-classification-config.c
+++ b/src/util-classification-config.c
@@ -128,10 +128,7 @@ static inline int SCClassConfInitContext(DetectEngineCtx *de_ctx)
  */
 static void SCClassConfDeInitContext(DetectEngineCtx *de_ctx)
 {
-    if (de_ctx->class_conf_ht != NULL) {
-        HashTableFree(de_ctx->class_conf_ht);
-        de_ctx->class_conf_ht = NULL;
-    }
+
     fclose(fd);
     default_file_path = SC_CLASS_CONF_DEF_CONF_FILEPATH;
     fd = NULL;