diff --git a/src/encoder_state-ctors_dtors.c b/src/encoder_state-ctors_dtors.c
index a5f424d7..e1e48ee6 100644
--- a/src/encoder_state-ctors_dtors.c
+++ b/src/encoder_state-ctors_dtors.c
@@ -54,6 +54,7 @@ static int encoder_state_config_frame_init(encoder_state_t * const state) {
 
   state->frame->rc_alpha = 3.2003;
   state->frame->rc_beta = -1.367;
+  state->frame->icost = 0;
 
   const encoder_control_t * const encoder = state->encoder_control;
   const int num_lcus = encoder->in.width_in_lcu * encoder->in.height_in_lcu;
@@ -70,10 +71,6 @@ static int encoder_state_config_frame_init(encoder_state_t * const state) {
 
   state->frame->new_ratecontrol = kvz_get_rc_data(NULL);
 
-  // state->frame->bpp_d = fopen("bits.txt", "wb");
-  // state->frame->c_d = fopen("c.txt", "wb");
-  // state->frame->k_d = fopen("k.txt", "wb");
-
   return 1;
 }
 
diff --git a/src/rate_control.c b/src/rate_control.c
index e4e767bf..9d14bef8 100644
--- a/src/rate_control.c
+++ b/src/rate_control.c
@@ -311,6 +311,17 @@ static double pic_allocate_bits(encoder_state_t * const state)
   }
 
   if (state->frame->is_irap && encoder->cfg.intra_bit_allocation) {
+    int total_cost = 0;
+    for (int y = 0; y < encoder->cfg.height; y += 8) {
+      for (int x = 0; x < encoder->cfg.width; x += 8) {
+        int cost = xCalcHADs8x8_ISlice(state->tile->frame->source->y + x, y, state->tile->frame->source->stride);
+        total_cost += cost;
+        kvz_get_lcu_stats(state, x / 64, y / 64)->i_cost += cost;
+      }
+    }
+    state->frame->icost = total_cost;
+    state->frame->remaining_weight = total_cost;
+
     double bits = state->frame->cur_gop_target_bits / MAX(encoder->cfg.gop_len, 1);
     double alpha, beta = 0.5582;
     if (bits * 40 < encoder->cfg.width * encoder->cfg.height) {
@@ -433,19 +444,6 @@ static INLINE double calculate_weights(encoder_state_t* const state, const int l
 void kvz_estimate_pic_lambda(encoder_state_t * const state) {
   const encoder_control_t * const encoder = state->encoder_control;
 
-  if(encoder->cfg.intra_bit_allocation && state->frame->is_irap) {
-    int total_cost = 0;
-    for (int y = 0; y < encoder->cfg.height; y += 8) {
-      for (int x = 0; x < encoder->cfg.width; x += 8) {
-        int cost = xCalcHADs8x8_ISlice(state->tile->frame->source->y + x, y, state->tile->frame->source->stride);
-        total_cost += cost;
-        kvz_get_lcu_stats(state, x / 64, y / 64)->i_cost += cost;
-      }
-    }
-    state->frame->icost = total_cost;
-    state->frame->remaining_weight = total_cost;
-  }
-
   const int layer = encoder->cfg.gop[state->frame->gop_offset].layer - (state->frame->is_irap ? 1 : 0);
   const int ctu_count = state->tile->frame->height_in_lcu * state->tile->frame->width_in_lcu;
 
@@ -755,8 +753,6 @@ static void update_pic_ck(encoder_state_t * const state, double bpp, double dist
     state->frame->new_ratecontrol->pic_c_para[layer] = new_c;
     state->frame->new_ratecontrol->pic_k_para[layer] = new_k;
   }
-  // fprintf(state->frame->c_d, "Frame %d\tC:\t%f\tbpp\t%f\tdistortion\t%f\tlambda\t%f\n", state->frame->num, new_c, bpp, distortion, lambda);
-  // fprintf(state->frame->k_d, "Frame %d\tK:\t%f\tbpp\t%f\tdistortion\t%f\tlambda\t%f\n", state->frame->num, new_k, bpp, distortion, lambda);
 }