diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index cc383a9..38a394e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -1675,38 +1675,6 @@ nn::Result ExportCalData()
             GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_RIGHT_STICK));
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.surroundCfgData, sizeof(SurroundCfgData),
-            GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.backlightPwmTableCfgData, sizeof(BacklightPwmTableCfgData),
-            GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_BACKLIGHT_PWM_TABLE));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ablDetailCfgData, sizeof(AblDetailCfgData),
-            GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_DETAIL));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ulcdLibAssumptionCfgData, sizeof(UlcdLibAssumptionCfgData),
-            GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCDLIB_ASSUMPTION));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ulcdDelayCfgData, sizeof(UlcdDelayCfgData),
-            GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCD_DELAY));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.echoCancelCfgData, sizeof(EchoCancelCfgData),
-            GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_ECHO_CANCEL));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.ablAppendCfgData, sizeof(AblAppendCfgData),
-            GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_APPEND));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::GetConfig(&cfgCalData.pitCfgData, sizeof(PitCfgData),
-            GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_PIT));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
     result = sdWriter.WriteBufWithCmac(common::CFG_CALIBRATION_PATHNAME, &cfgCalData, sizeof(cfgCalData));
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
@@ -1805,42 +1773,6 @@ nn::Result InitializeHardwareDependentSetting()
             &cfgCalData.rightStickCfgData, sizeof(RightStickCfgData));
     COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_SURROUND_CAL),
-            &cfgCalData.surroundCfgData, sizeof(SurroundCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_BACKLIGHT_PWM_TABLE),
-            &cfgCalData.backlightPwmTableCfgData, sizeof(BacklightPwmTableCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_DETAIL),
-            &cfgCalData.ablDetailCfgData, sizeof(AblDetailCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    // LGY
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_DETAIL_LGY),
-            &cfgCalData.ablDetailCfgData, sizeof(AblDetailCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCDLIB_ASSUMPTION),
-            &cfgCalData.ulcdLibAssumptionCfgData, sizeof(UlcdLibAssumptionCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ULCD_DELAY),
-            &cfgCalData.ulcdDelayCfgData, sizeof(UlcdDelayCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_SOUND, NN_CFG_SOUND_ECHO_CANCEL),
-            &cfgCalData.echoCancelCfgData, sizeof(EchoCancelCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_ABL_APPEND),
-            &cfgCalData.ablAppendCfgData, sizeof(AblAppendCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
-
-    result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_PIT),
-            &cfgCalData.pitCfgData, sizeof(PitCfgData));
-    COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result);
 
     NN_LOG("Set cfgCalData\n");
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
index 42c8196..182bcac 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/RestoreTypes.h
@@ -31,18 +31,8 @@ struct CfgCalData
     nn::cfg::CTR::detail::CodecCfgData codecCfgData;
     nn::cfg::CTR::detail::McuSlideVolumeRangeCfgData mcuSlideVolumeRangeCfgData;
     NN_PADDING2;
-
     nn::cfg::CTR::detail::QtmCameraCfgData qtmCameraCfgData;
     nn::cfg::CTR::detail::RightStickCfgData rightStickCfgData;
-    nn::cfg::CTR::detail::SurroundCfgData surroundCfgData;
-    nn::cfg::CTR::detail::BacklightPwmTableCfgData backlightPwmTableCfgData;
-    nn::cfg::CTR::detail::AblDetailCfgData ablDetailCfgData;
-    nn::cfg::CTR::detail::UlcdLibAssumptionCfgData ulcdLibAssumptionCfgData;
-    nn::cfg::CTR::detail::UlcdDelayCfgData ulcdDelayCfgData;
-    NN_PADDING2;
-    nn::cfg::CTR::detail::EchoCancelCfgData echoCancelCfgData;
-    nn::cfg::CTR::detail::AblAppendCfgData ablAppendCfgData;
-    nn::cfg::CTR::detail::PitCfgData pitCfgData;
 };
 
 }