diff --git a/source/keys/keys.c b/source/keys/keys.c
index 3502f7e..5dfe99d 100644
--- a/source/keys/keys.c
+++ b/source/keys/keys.c
@@ -118,7 +118,7 @@ static void _derive_bis_keys(key_derivation_ctx_t *keys) {
     /*  key = unwrap(source, wrapped_key):
         key_set(ks, wrapped_key), block_ecb(ks, 0, key, source) -> final key in key
     */
-    minerva_periodic_training();
+
     u32 key_generation = fuse_read_odm_keygen_rev();
     if (key_generation)
         key_generation--;
@@ -197,8 +197,6 @@ static bool _derive_tsec_keys(tsec_ctxt_t *tsec_ctxt, key_derivation_ctx_t *keys
         return false;
     }
 
-    minerva_periodic_training();
-
     tsec_ctxt->size = _get_tsec_fw_size((tsec_key_data_t *)(tsec_ctxt->fw + TSEC_KEY_DATA_OFFSET));
     if (tsec_ctxt->size > PKG1_MAX_SIZE) {
         DPRINTF("Unexpected TSEC firmware size.");
diff --git a/source/main.c b/source/main.c
index 78c8507..a6a62ec 100644
--- a/source/main.c
+++ b/source/main.c
@@ -250,10 +250,8 @@ void ipl_main()
 	TConf.minervaEnabled = !minerva_init();
 	TConf.FSBuffSize = (TConf.minervaEnabled) ? 0x800000 : 0x10000;
 
-	// Train DRAM and switch to max frequency.
-	if (TConf.minervaEnabled) //!TODO: Add Tegra210B01 support to minerva.
+	if (!TConf.minervaEnabled) //!TODO: Add Tegra210B01 support to minerva.
 		h_cfg.errors |= ERR_LIBSYS_MTC;
-	minerva_change_freq(FREQ_1600);
 
 	display_init();
 
@@ -267,6 +265,7 @@ void ipl_main()
 
 	// Overclock BPMP.
 	bpmp_clk_rate_set(BPMP_CLK_DEFAULT_BOOST);
+	minerva_change_freq(FREQ_800);
 
 	emummc_load_cfg();
 	// Ignore whether emummc is enabled.
@@ -277,23 +276,11 @@ void ipl_main()
 	TConf.pkg1ID = "Unk";
 
 	hidInit();
-
-	//gfx_clearscreen();
-	//Vector_t a = vecFromArray(testEntries, 9, sizeof(MenuEntry_t));
-	//u32 res = newMenu(&a, 0, 40, 5, testAdd, NULL);
-
-	//gfx_clearscreen();
-	//DrawError(newErrCode(1));
-
-	// TODO: Write exceptions in err.c and check them here
-
 	_show_errors();
-
 	gfx_clearscreen();
 
 	int res = -1;
 
-	
 	if (btn_read() & BTN_VOL_DOWN || DumpKeys())
 		res = GetKeysFromFile("sd:/switch/prod.keys");