diff --git a/docs/changes.txt b/docs/changes.txt
index 8bcc55851..2c7852a53 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -34,6 +34,7 @@
 - Fixed mask length check in hybrid attack-modes: Do not include hash-mode dependant mask length checks
 - Fixed parsing of hashes in case the last line did not include a linefeed character
 - Fixed potfile loading to accept blank passwords
+- Fixed runtime limit: No longer required so sample startup time after refactorization
 
 ##
 ## Workarounds
diff --git a/include/types.h b/include/types.h
index 2228282ac..177ac508e 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1707,9 +1707,6 @@ typedef struct status_ctx
   time_t  runtime_start;
   time_t  runtime_stop;
 
-  time_t  prepare_start;
-  time_t  prepare_time;
-
   hc_timer_t timer_running;     // timer on current dict
   hc_timer_t timer_paused;      // timer on current dict
 
diff --git a/src/hashcat.c b/src/hashcat.c
index 79e254f6f..061689d31 100644
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -208,8 +208,6 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx)
 
   status_ctx->runtime_start = runtime_start;
 
-  status_ctx->prepare_time = runtime_start - status_ctx->prepare_start;
-
   /**
    * create cracker threads
    */
@@ -262,8 +260,6 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx)
   logfile_sub_uint (runtime_start);
   logfile_sub_uint (runtime_stop);
 
-  time (&status_ctx->prepare_start);
-
   hashcat_get_status (hashcat_ctx, status_ctx->hashcat_status_final);
 
   status_ctx->accessible = false;
@@ -395,12 +391,6 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
   status_ctx->run_thread_level1 = true;
   status_ctx->run_thread_level2 = true;
 
-  /**
-   * setup prepare timer
-   */
-
-  time (&status_ctx->prepare_start);
-
   /**
    * setup variables and buffers depending on hash_mode
    */
diff --git a/src/monitor.c b/src/monitor.c
index 0de0e67d0..b051ae37e 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -35,7 +35,6 @@ int get_runtime_left (const hashcat_ctx_t *hashcat_ctx)
   time (&runtime_cur);
 
   const int runtime_left = (int) (status_ctx->runtime_start
-                                + status_ctx->prepare_time
                                 + user_options->runtime
                                 + (msec_paused / 1000)
                                 - runtime_cur);