Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r9363dbc93c2be5d664c0ca2a565d8206679d9bf3 -r164a50fa822abc70bcca94b80680701214f0b1bf
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 9363dbc93c2be5d664c0ca2a565d8206679d9bf3)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 164a50fa822abc70bcca94b80680701214f0b1bf)
@@ -760,15 +760,13 @@
 
     QString msg = "";
     int     err = 0 ;
-    //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
-    Storage::Settings settings;
     // moving the configuration files if the encrypted partition creation was successful.
     if (   isUpdate                     ) goto lMove; // if it is gEnableUpdating, bypass the mAccepted for already mounted.
     if ( ! model._data.mAccepted        ) goto lErr ; // any other case goto error
     if ( ! isSetup                      ) goto lOut ; // if not setup do NOT continue to move configurations
 
 lMove:
-    err = settings.configurationsMove(&msg, isUpdate);
+    err = Storage::Settings::configurationsMove(&msg, isUpdate);
     if ( err ) {
         model._data.mAccepted   = false ;
         model._data.mReason     = err   ;