diff --git a/include/interface_migrate.h b/include/interface_migrate.h
index b12ca8543..242ba6cf0 100644
--- a/include/interface_migrate.h
+++ b/include/interface_migrate.h
@@ -636,7 +636,6 @@ typedef enum hash_type
   HASH_TYPE_ECRYPTFS            = 47,
   HASH_TYPE_ORACLET             = 48,
   HASH_TYPE_BSDICRYPT           = 49,
-  HASH_TYPE_STDOUT              = 52,
   HASH_TYPE_PLAINTEXT           = 54,
   HASH_TYPE_LUKS                = 55,
   HASH_TYPE_ITUNES_BACKUP_9     = 56,
@@ -677,7 +676,6 @@ typedef enum kern_type
   KERN_TYPE_SHA512_SLTPWU           = 1740,
   KERN_TYPE_HMACSHA512_PW           = 1750,
   KERN_TYPE_HMACSHA512_SLT          = 1760,
-  KERN_TYPE_STDOUT                  = 2000,
   KERN_TYPE_DCC2                    = 2100,
   KERN_TYPE_MD5ASA                  = 2410,
   KERN_TYPE_MD55                    = 2600,
@@ -855,7 +853,6 @@ typedef enum rounds_count
    ROUNDS_ETHEREUM_PBKDF2    = 262144 - 1,
    ROUNDS_APPLE_SECURE_NOTES = 20000,
    ROUNDS_ETHEREUM_PRESALE   = 2000 - 1,
-   ROUNDS_STDOUT             = 0
 
 } rounds_count_t;
 
diff --git a/include/types.h b/include/types.h
index 41ed3477c..2022995a9 100644
--- a/include/types.h
+++ b/include/types.h
@@ -2442,22 +2442,21 @@ typedef enum hash_category
   HASH_CATEGORY_RAW_HASH                = 1,
   HASH_CATEGORY_RAW_HASH_SALTED         = 2,
   HASH_CATEGORY_RAW_HASH_AUTHENTICATED  = 3,
-  HASH_CATEGORY_RAW_CIPHER_KPA          = 4,
-  HASH_CATEGORY_GENERIC_KDF             = 5,
-  HASH_CATEGORY_NETWORK_PROTOCOL        = 6,
-  HASH_CATEGORY_FORUM_SOFTWARE          = 7,
-  HASH_CATEGORY_DATABASE_SERVER         = 8,
-  HASH_CATEGORY_NETWORK_SERVER          = 9,
-  HASH_CATEGORY_RAW_CHECKSUM            = 10,
-  HASH_CATEGORY_OS                      = 11,
-  HASH_CATEGORY_EAS                     = 12,
-  HASH_CATEGORY_ARCHIVE                 = 13,
-  HASH_CATEGORY_BACKUP                  = 14,
-  HASH_CATEGORY_FDE                     = 15,
-  HASH_CATEGORY_DOCUMENTS               = 16,
-  HASH_CATEGORY_PASSWORD_MANAGER        = 17,
-  HASH_CATEGORY_OTP                     = 18,
-  HASH_CATEGORY_PLAIN                   = 19,
+  HASH_CATEGORY_RAW_CHECKSUM            = 4,
+  HASH_CATEGORY_RAW_CIPHER_KPA          = 5,
+  HASH_CATEGORY_GENERIC_KDF             = 6,
+  HASH_CATEGORY_NETWORK_PROTOCOL        = 7,
+  HASH_CATEGORY_OS                      = 8,
+  HASH_CATEGORY_DATABASE_SERVER         = 9,
+  HASH_CATEGORY_NETWORK_SERVER          = 10,
+  HASH_CATEGORY_EAS                     = 11,
+  HASH_CATEGORY_FDE                     = 12,
+  HASH_CATEGORY_DOCUMENTS               = 13,
+  HASH_CATEGORY_PASSWORD_MANAGER        = 14,
+  HASH_CATEGORY_ARCHIVE                 = 15,
+  HASH_CATEGORY_FORUM_SOFTWARE          = 16,
+  HASH_CATEGORY_OTP                     = 17,
+  HASH_CATEGORY_PLAIN                   = 18,
 
 } hash_category_t;
 
diff --git a/src/interface_migrate.c b/src/interface_migrate.c
index 71129f2b9..efb73b276 100644
--- a/src/interface_migrate.c
+++ b/src/interface_migrate.c
@@ -17540,22 +17540,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
                  hashconfig->st_pass        = ST_PASS_HASHCAT_PLAIN;
                  break;
 
-    case  2000:  hashconfig->hash_type      = HASH_TYPE_STDOUT;
-                 hashconfig->salt_type      = SALT_TYPE_NONE;
-                 hashconfig->attack_exec    = ATTACK_EXEC_INSIDE_KERNEL;
-                 hashconfig->opts_type      = OPTS_TYPE_PT_GENERATE_LE;
-                 hashconfig->kern_type      = KERN_TYPE_STDOUT;
-                 hashconfig->dgst_size      = DGST_SIZE_4_4;
-                 hashconfig->parse_func     = NULL;
-                 hashconfig->opti_type      = 0;
-                 hashconfig->dgst_pos0      = 0;
-                 hashconfig->dgst_pos1      = 0;
-                 hashconfig->dgst_pos2      = 0;
-                 hashconfig->dgst_pos3      = 0;
-                 hashconfig->st_hash        = NULL;
-                 hashconfig->st_pass        = ST_PASS_HASHCAT_PLAIN;
-                 break;
-
     case  2100:  hashconfig->hash_type      = HASH_TYPE_DCC2;
                  hashconfig->salt_type      = SALT_TYPE_EMBEDDED;
                  hashconfig->attack_exec    = ATTACK_EXEC_OUTSIDE_KERNEL;
@@ -20663,16 +20647,6 @@ const char *default_benchmark_mask (MAYBE_UNUSED const hashconfig_t *hashconfig,
 
 }
 
-bool default_warmup_disable (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
-{
-
-  switch (hashconfig->hash_mode)
-  {
-    case  2000: return true;
-  }
-
-}
-
 bool default_hlfmt_disable (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
 {
 
diff --git a/src/modules/module_11500.c b/src/modules/module_11500.c
index af7a9b221..65c314945 100644
--- a/src/modules/module_11500.c
+++ b/src/modules/module_11500.c
@@ -16,7 +16,7 @@ static const u32   DGST_POS1      = 1;
 static const u32   DGST_POS2      = 2;
 static const u32   DGST_POS3      = 3;
 static const u32   DGST_SIZE      = DGST_SIZE_4_4;
-static const u32   HASH_CATEGORY  = HASH_CATEGORY_RAW_HASH;
+static const u32   HASH_CATEGORY  = HASH_CATEGORY_RAW_CHECKSUM;
 static const char *HASH_NAME      = "CRC32";
 static const u32   HASH_TYPE      = HASH_TYPE_GENERIC;
 static const u64   KERN_TYPE      = 11500;
diff --git a/src/shared.c b/src/shared.c
index 9ea85b230..87b42d28f 100644
--- a/src/shared.c
+++ b/src/shared.c
@@ -91,7 +91,6 @@ static const char *HASH_CATEGORY_RAW_CHECKSUM_STR           = "Raw Checksum";
 static const char *HASH_CATEGORY_OS_STR                     = "Operating System";
 static const char *HASH_CATEGORY_EAS_STR                    = "Enterprise Application Software (EAS)";
 static const char *HASH_CATEGORY_ARCHIVE_STR                = "Archives";
-static const char *HASH_CATEGORY_BACKUP_STR                 = "Backup";
 static const char *HASH_CATEGORY_FDE_STR                    = "Full-Disk Encryption (FDE)";
 static const char *HASH_CATEGORY_DOCUMENTS_STR              = "Documents";
 static const char *HASH_CATEGORY_PASSWORD_MANAGER_STR       = "Password Managers";
@@ -905,7 +904,6 @@ const char *strhashcategory (const u32 hash_category)
     case HASH_CATEGORY_OS:                      return HASH_CATEGORY_OS_STR;
     case HASH_CATEGORY_EAS:                     return HASH_CATEGORY_EAS_STR;
     case HASH_CATEGORY_ARCHIVE:                 return HASH_CATEGORY_ARCHIVE_STR;
-    case HASH_CATEGORY_BACKUP:                  return HASH_CATEGORY_BACKUP_STR;
     case HASH_CATEGORY_FDE:                     return HASH_CATEGORY_FDE_STR;
     case HASH_CATEGORY_DOCUMENTS:               return HASH_CATEGORY_DOCUMENTS_STR;
     case HASH_CATEGORY_PASSWORD_MANAGER:        return HASH_CATEGORY_PASSWORD_MANAGER_STR;
diff --git a/src/usage.c b/src/usage.c
index 167fc79e9..a6cac4569 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -12,7 +12,7 @@
 
 static const char *const USAGE_MINI[] =
 {
-  "Usage: %s [options]... hash|hashfile|hccapxfile [dictionary|mask|directory]...",
+  "Usage: hashcat [options]... hash|hashfile|hccapxfile [dictionary|mask|directory]...",
   "",
   "Try --help for more help.",
   NULL
@@ -20,7 +20,7 @@ static const char *const USAGE_MINI[] =
 
 static const char *const USAGE_BIG_PRE_HASHMODES[] =
 {
-  "Usage: %s [options]... hash|hashfile|hccapxfile [dictionary|mask|directory]...",
+  "Usage: hashcat [options]... hash|hashfile|hccapxfile [dictionary|mask|directory]...",
   "",
   "- [ Options ] -",
   "",
@@ -223,10 +223,10 @@ static const char *const USAGE_BIG_POST_HASHMODES[] =
   "  Attack-          | Hash- |",
   "  Mode             | Type  | Example command",
   " ==================+=======+==================================================================",
-  "  Wordlist         | $P$   | %s -a 0 -m 400 example400.hash example.dict",
-  "  Wordlist + Rules | MD5   | %s -a 0 -m 0 example0.hash example.dict -r rules/best64.rule",
-  "  Brute-Force      | MD5   | %s -a 3 -m 0 example0.hash ?a?a?a?a?a?a",
-  "  Combinator       | MD5   | %s -a 1 -m 0 example0.hash example.dict example.dict",
+  "  Wordlist         | $P$   | hashcat -a 0 -m 400 example400.hash example.dict",
+  "  Wordlist + Rules | MD5   | hashcat -a 0 -m 0 example0.hash example.dict -r rules/best64.rule",
+  "  Brute-Force      | MD5   | hashcat -a 3 -m 0 example0.hash ?a?a?a?a?a?a",
+  "  Combinator       | MD5   | hashcat -a 1 -m 0 example0.hash example.dict example.dict",
   "",
   "If you still have no idea what just happened, try the following pages:",
   "",