diff --git a/src/hashes.c b/src/hashes.c
index 97d765948..a1822c6ba 100644
--- a/src/hashes.c
+++ b/src/hashes.c
@@ -2211,7 +2211,6 @@ int hashes_init_stage3 (hashcat_ctx_t *hashcat_ctx)
   hashes->digests_done_zero = digests_done_zero;
   hashes->digests_done_pot  = digests_done_pot;
 
-  hashes->salts_cnt         = salts_cnt;
   hashes->salts_done        = salts_done;
 
   return 0;
diff --git a/src/modules/module_02500.c b/src/modules/module_02500.c
index 1a5d75cad..a49559ff5 100644
--- a/src/modules/module_02500.c
+++ b/src/modules/module_02500.c
@@ -557,8 +557,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
   kernel_param.digests_offset_host = 0;
   kernel_param.combs_mode          = 0;
   kernel_param.salt_repeat         = 0;
-  kernel_param.combs_mode          = 0;
-  kernel_param.salt_repeat         = 0;
   kernel_param.pws_pos             = 0;
   kernel_param.gid_max             = 1;
 
diff --git a/src/modules/module_02501.c b/src/modules/module_02501.c
index 63d7a158e..2e97a32fc 100644
--- a/src/modules/module_02501.c
+++ b/src/modules/module_02501.c
@@ -533,8 +533,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
   kernel_param.digests_offset_host = 0;
   kernel_param.combs_mode          = 0;
   kernel_param.salt_repeat         = 0;
-  kernel_param.combs_mode          = 0;
-  kernel_param.salt_repeat         = 0;
   kernel_param.pws_pos             = 0;
   kernel_param.gid_max             = 1;
 
diff --git a/src/modules/module_13400.c b/src/modules/module_13400.c
index 2ce9fc5ca..0c7b2c995 100644
--- a/src/modules/module_13400.c
+++ b/src/modules/module_13400.c
@@ -139,8 +139,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   token.attr[3]    = TOKEN_ATTR_VERIFY_LENGTH
                    | TOKEN_ATTR_VERIFY_DIGIT;
 
-  if (line_len < 16) return (PARSER_SALT_LENGTH);
-
   const u8 version = line_buf[10];
 
   if (version == '1')
diff --git a/src/modules/module_16800.c b/src/modules/module_16800.c
index f01ac61ee..9022b4cfb 100644
--- a/src/modules/module_16800.c
+++ b/src/modules/module_16800.c
@@ -269,8 +269,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
   kernel_param.digests_offset_host = 0;
   kernel_param.combs_mode          = 0;
   kernel_param.salt_repeat         = 0;
-  kernel_param.combs_mode          = 0;
-  kernel_param.salt_repeat         = 0;
   kernel_param.pws_pos             = 0;
   kernel_param.gid_max             = 1;
 
diff --git a/src/modules/module_16801.c b/src/modules/module_16801.c
index 43886ed82..183677ace 100644
--- a/src/modules/module_16801.c
+++ b/src/modules/module_16801.c
@@ -291,8 +291,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
   kernel_param.digests_offset_host = 0;
   kernel_param.combs_mode          = 0;
   kernel_param.salt_repeat         = 0;
-  kernel_param.combs_mode          = 0;
-  kernel_param.salt_repeat         = 0;
   kernel_param.pws_pos             = 0;
   kernel_param.gid_max             = 1;
 
diff --git a/src/modules/module_22000.c b/src/modules/module_22000.c
index 5c20d6c7d..bc0b76917 100644
--- a/src/modules/module_22000.c
+++ b/src/modules/module_22000.c
@@ -582,8 +582,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
   kernel_param.digests_offset_host = 0;
   kernel_param.combs_mode          = 0;
   kernel_param.salt_repeat         = 0;
-  kernel_param.combs_mode          = 0;
-  kernel_param.salt_repeat         = 0;
   kernel_param.pws_pos             = 0;
   kernel_param.gid_max             = 1;
 
diff --git a/src/modules/module_22001.c b/src/modules/module_22001.c
index 8bd35cd2b..ee152d7c3 100644
--- a/src/modules/module_22001.c
+++ b/src/modules/module_22001.c
@@ -584,8 +584,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
   kernel_param.digests_offset_host = 0;
   kernel_param.combs_mode          = 0;
   kernel_param.salt_repeat         = 0;
-  kernel_param.combs_mode          = 0;
-  kernel_param.salt_repeat         = 0;
   kernel_param.pws_pos             = 0;
   kernel_param.gid_max             = 1;
 
diff --git a/src/modules/module_23900.c b/src/modules/module_23900.c
index ffc1f2b39..56febb803 100644
--- a/src/modules/module_23900.c
+++ b/src/modules/module_23900.c
@@ -143,9 +143,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   if (parse_rc == false) return (PARSER_SALT_LENGTH);
 
-  salt->salt_buf[0] = salt->salt_buf[0];
-  salt->salt_buf[1] = salt->salt_buf[1];
-
   salt->salt_buf[0] = byte_swap_32 (salt->salt_buf[0]);
   salt->salt_buf[1] = byte_swap_32 (salt->salt_buf[1]);
 
diff --git a/src/modules/module_29700.c b/src/modules/module_29700.c
index bfa0c1801..872051c1f 100644
--- a/src/modules/module_29700.c
+++ b/src/modules/module_29700.c
@@ -149,8 +149,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
   token.attr[3]    = TOKEN_ATTR_VERIFY_LENGTH
                    | TOKEN_ATTR_VERIFY_DIGIT;
 
-  if (line_len < 16) return (PARSER_SALT_LENGTH);
-
   const u8 version = line_buf[10];
 
   if (version == '1')
diff --git a/src/modules/module_32060.c b/src/modules/module_32060.c
index 8933dc487..ba7029dfa 100644
--- a/src/modules/module_32060.c
+++ b/src/modules/module_32060.c
@@ -22,7 +22,6 @@ static const u64   KERN_TYPE      = 10900;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
                                   | OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
 static const u64   OPTS_TYPE      = OPTS_TYPE_STOCK_MODULE
-                                  | OPTS_TYPE_ST_BASE64
                                   | OPTS_TYPE_PT_GENERATE_LE
                                   | OPTS_TYPE_ST_BASE64;
 static const u32   SALT_TYPE      = SALT_TYPE_EMBEDDED;