diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 7b114d3..aa7589e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -616,6 +616,8 @@ void InitializeFileSystem()
         nn::fs::Unmount(common::TWL_ARCHIVE_NAME_TABLE[i]);
     }
 
+    result = nn::am::DeleteAllTwlUserPrograms();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     nn::fs::InitializeCtrFileSystem();
 }
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
index b165be6..3a1b0bd 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
@@ -380,10 +380,10 @@ void ShopOperationUnregisterCore(bool force)
     ECAccountInfo* pAccountInfo;
     result = ShopOperationConnect(&pAccountInfo);
     NIM_SHOP_RESULT_CHECK(result);
-    if(force)
+    if (force)
     {
-    if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R' ||
-            pAccountInfo->accountStatus[0] == 'T'))
+        if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R' || pAccountInfo->accountStatus[0]
+                == 'T'))
         {
             COMMON_LOGGER_DETAIL("nim::Shop::Unregister\n");
             result = nn::nim::Shop::Unregister();
@@ -392,7 +392,7 @@ void ShopOperationUnregisterCore(bool force)
     }
     else
     {
-    if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R'))
+        if (pAccountInfo->accountStatus && (pAccountInfo->accountStatus[0] == 'R'))
         {
             COMMON_LOGGER_DETAIL("nim::Shop::Unregister\n");
             result = nn::nim::Shop::Unregister();