diff --git a/include/interface_migrate.h b/include/interface_migrate.h
index a247d116f..156283bdd 100644
--- a/include/interface_migrate.h
+++ b/include/interface_migrate.h
@@ -364,7 +364,6 @@ typedef enum kern_type
   KERN_TYPE_SHA1_SLT_PW_SLT         = 4900,
   KERN_TYPE_RIPEMD160               = 6000,
   KERN_TYPE_WHIRLPOOL               = 6100,
-  KERN_TYPE_MD5AIX                  = 6300,
   KERN_TYPE_GOST                    = 6900,
   KERN_TYPE_FORTIGATE               = 7000,
   KERN_TYPE_RAKP                    = 7300,
diff --git a/src/interface_migrate.c b/src/interface_migrate.c
index 273bfcc7b..e1dff7fdc 100644
--- a/src/interface_migrate.c
+++ b/src/interface_migrate.c
@@ -84,7 +84,6 @@
   "   7400 | sha256crypt $5$, SHA256 (Unix)                   | Operating Systems",
   "    122 | macOS v10.4, MacOS v10.5, MacOS v10.6            | Operating Systems",
   "   1722 | macOS v10.7                                      | Operating Systems",
-  "   6300 | AIX {smd5}                                       | Operating Systems",
   "    500 | Cisco-IOS $1$ (MD5)                              | Operating Systems",
   "   9200 | Cisco-IOS $8$ (PBKDF2-SHA256)                    | Operating Systems",
   "     22 | Juniper NetScreen/SSG (ScreenOS)                 | Operating Systems",
@@ -187,7 +186,6 @@ static const char *ST_HASH_04700 = "92d85978d884eb1d99a51652b1139c8279fa8663";
 static const char *ST_HASH_04900 = "75d280ca9a0c2ee18729603104ead576d9ca6285:347070";
 static const char *ST_HASH_06000 = "012cb9b334ec1aeb71a9c8ce85586082467f7eb6";
 static const char *ST_HASH_06100 = "7ca8eaaaa15eaa4c038b4c47b9313e92da827c06940e69947f85bc0fbef3eb8fd254da220ad9e208b6b28f6bb9be31dd760f1fdb26112d83f87d96b416a4d258";
-static const char *ST_HASH_06300 = "{smd5}17800721$WkGka7tXcrfpUQS6WOQyw/";
 static const char *ST_HASH_06900 = "df226c2c6dcb1d995c0299a33a084b201544293c31fc3d279530121d36bbcea9";
 static const char *ST_HASH_07000 = "AK1FCIhM0IUIQVFJgcDFwLCMi7GppdwtRzMyDpFOFxdpH8=";
 static const char *ST_HASH_07300 = "3437343735333336383831353232323433383333303236303337333338363232303135383237333638363532373231343030313131333838323734373138363632343133333335353030353633373533333133313530363533303738343334313330303630343633333237373037383537333630303233303830303437323838333237313438363238343434383831363634323431333430383735323038:f4b376e25868751fc0264f573ff1fe50b65ce5a2";
@@ -288,7 +286,6 @@ static const char *HT_04700 = "sha1(md5($pass))";
 static const char *HT_04900 = "sha1($salt.$pass.$salt)";
 static const char *HT_06000 = "RIPEMD-160";
 static const char *HT_06100 = "Whirlpool";
-static const char *HT_06300 = "AIX {smd5}";
 static const char *HT_06900 = "GOST R 34.11-94";
 static const char *HT_07000 = "FortiGate (FortiOS)";
 static const char *HT_07300 = "IPMI2 RAKP HMAC-SHA1";
@@ -387,7 +384,6 @@ static const char *SIGNATURE_DJANGOSHA1         = "sha1$";
 static const char *SIGNATURE_DRUPAL7            = "$S$";
 static const char *SIGNATURE_ECRYPTFS           = "$ecryptfs$";
 static const char *SIGNATURE_EPISERVER          = "$episerver$";
-static const char *SIGNATURE_MD5AIX             = "{smd5}";
 static const char *SIGNATURE_MEDIAWIKI_B        = "$B$";
 static const char *SIGNATURE_MS_DRSR            = "v1;PPH1_MD4";
 static const char *SIGNATURE_MSSQL              = "0x0100";
@@ -11754,23 +11750,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
                  hashconfig->st_pass        = ST_PASS_HASHCAT_PLAIN;
                  break;
 
-    case  6300:  hashconfig->hash_type      = HASH_TYPE_MD5;
-                 hashconfig->salt_type      = SALT_TYPE_EMBEDDED;
-                 hashconfig->attack_exec    = ATTACK_EXEC_OUTSIDE_KERNEL;
-                 hashconfig->opts_type      = OPTS_TYPE_PT_GENERATE_LE
-                                            | OPTS_TYPE_PREFERED_THREAD;
-                 hashconfig->kern_type      = KERN_TYPE_MD5AIX;
-                 hashconfig->dgst_size      = DGST_SIZE_4_4;
-                 hashconfig->parse_func     = md5aix_parse_hash;
-                 hashconfig->opti_type      = OPTI_TYPE_ZERO_BYTE;
-                 hashconfig->dgst_pos0      = 0;
-                 hashconfig->dgst_pos1      = 1;
-                 hashconfig->dgst_pos2      = 2;
-                 hashconfig->dgst_pos3      = 3;
-                 hashconfig->st_hash        = ST_HASH_06300;
-                 hashconfig->st_pass        = ST_PASS_HASHCAT_PLAIN;
-                 break;
-
     case  6900:  hashconfig->hash_type      = HASH_TYPE_GOST;
                  hashconfig->salt_type      = SALT_TYPE_NONE;
                  hashconfig->attack_exec    = ATTACK_EXEC_INSIDE_KERNEL;
diff --git a/src/modules/module_06300.c b/src/modules/module_06300.c
index ae6ba49fd..477462012 100644
--- a/src/modules/module_06300.c
+++ b/src/modules/module_06300.c
@@ -225,7 +225,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   md5crypt_encode (digest_buf, tmp);
 
-  const int line_len = snprintf (line_buf, line_size, "{smd5}%s$%s", (char *) salt->salt_buf, tmp);
+  const int line_len = snprintf (line_buf, line_size, "%s%s$%s", SIGNATURE_MD5AIX, (char *) salt->salt_buf, tmp);
 
   return line_len;
 }
diff --git a/src/modules/module_06400.c b/src/modules/module_06400.c
index cd97e7f48..8d163047a 100644
--- a/src/modules/module_06400.c
+++ b/src/modules/module_06400.c
@@ -348,7 +348,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha256aix_encode ((unsigned char *) tmp, (unsigned char *) ptr_plain);
 
-  const int line_len = snprintf (line_buf, line_size, "{ssha256}%02u$%s$%s", salt->salt_sign[0], (char *) salt->salt_buf, ptr_plain);
+  const int line_len = snprintf (line_buf, line_size, "%s%02u$%s$%s", SIGNATURE_SHA256AIX, salt->salt_sign[0], (char *) salt->salt_buf, ptr_plain);
 
   return line_len;
 }
diff --git a/src/modules/module_06500.c b/src/modules/module_06500.c
index 85a783c2b..a0ad80afc 100644
--- a/src/modules/module_06500.c
+++ b/src/modules/module_06500.c
@@ -522,7 +522,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha512aix_encode ((unsigned char *) tmp, (unsigned char *) ptr_plain);
 
-  const int line_len = snprintf (line_buf, line_size, "{ssha512}%02u$%s$%s", salt->salt_sign[0], (char *) salt->salt_buf, ptr_plain);
+  const int line_len = snprintf (line_buf, line_size, "%s%02u$%s$%s", SIGNATURE_SHA512AIX, salt->salt_sign[0], (char *) salt->salt_buf, ptr_plain);
 
   return line_len;
 }
diff --git a/src/modules/module_06700.c b/src/modules/module_06700.c
index 314c19b43..1eb2a6d1e 100644
--- a/src/modules/module_06700.c
+++ b/src/modules/module_06700.c
@@ -275,7 +275,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   sha1aix_encode ((unsigned char *) tmp, (unsigned char *) ptr_plain);
 
-  const int line_len = snprintf (line_buf, line_size, "{ssha1}%02u$%s$%s", salt->salt_sign[0], (char *) salt->salt_buf, ptr_plain);
+  const int line_len = snprintf (line_buf, line_size, "%s%02u$%s$%s", SIGNATURE_SHA1AIX, salt->salt_sign[0], (char *) salt->salt_buf, ptr_plain);
 
   return line_len;
 }