Index: scripts/globals.sh
===================================================================
diff -u -rd638f1b23e6ec1c200643e8233cd65972621ca25 -rfa220019a309871996ad169368b32179a4a7f4a7
--- scripts/globals.sh	(.../globals.sh)	(revision d638f1b23e6ec1c200643e8233cd65972621ca25)
+++ scripts/globals.sh	(.../globals.sh)	(revision fa220019a309871996ad169368b32179a4a7f4a7)
@@ -508,11 +508,16 @@
       # removing the previous treatment logs so the new buff starts with fresh sequence
       echo "Removing CloudSync I/O buff"
       local CLOUDSYNC_LOGS="$SDCARD_MNT/$CLOUDSYNC_FOLDER/"
+      local CLOUDSYNC_CONF="$CLOUDSYNC_PATH/cloudsync/config/"
+      local CLOUDSYNC_MODE=""
+      if [[ "$APPLICATION_PARAMS" == *"-E"* ]]; then
+        CLOUDSYNC_MODE="registration"
+      fi
       rm $(find $CLOUDSYNC_LOGS -name "*[_inp,_out].buf" ) 1>> $POSTOUT 2>> $POSTERR
-
+      rm $(find $CLOUDSYNC_CONF -name "config_*.json"    ) 1>> $POSTOUT 2>> $POSTERR
       echo "Executing the CloudSync"
       cd $CLOUDSYNC_PATH
-      ./cs.py start debug &
+      ./cs.py start debug $CLOUDSYNC_MODE &
       CLOUDSYNC_STATUS="$(ps ax | grep -e cs.py -e cloud_sync.py | grep -v grep)"
       if [ -n "$CLOUDSYNC_STATUS" ]; then
           post_log_pass "$POSTMSG_CLOUDSYNC$POSTMSG_POSTFIX_PASSED"
Index: scripts/start.sh
===================================================================
diff -u -rd638f1b23e6ec1c200643e8233cd65972621ca25 -rfa220019a309871996ad169368b32179a4a7f4a7
--- scripts/start.sh	(.../start.sh)	(revision d638f1b23e6ec1c200643e8233cd65972621ca25)
+++ scripts/start.sh	(.../start.sh)	(revision fa220019a309871996ad169368b32179a4a7f4a7)
@@ -38,7 +38,6 @@
 SERVER_CONFIG_EXT="json"
 SERVER_CONFIG_JSON="$SERVER_CONFIG_FILE.$SERVER_CONFIG_EXT"
 SERVER_CONFIG_JSON_WS="$SERVER_CONFIG_FILE"
-SERVER_CONFIG_JSON_WS_ALL="$SERVER_CONFIG_JSON_WS"_*.""$SERVER_CONFIG_EXT"
 SERVER_DRT_WS_PRODUCT="production"
 SERVER_DRT_WS_STAGING="staging"
 SERVER_DRT_WS_QUALITY="quality"
@@ -98,7 +97,6 @@
   
   # creat the config.json file
   cp "$SERVER_CONFIG_JSON_WS""_""$SERVER_WS"".""$SERVER_CONFIG_EXT" $SERVER_CONFIG_JSON   # copy the config for the selected environment to config.json
-  rm "$SERVER_CONFIG_JSON_WS_ALL"                                                         # remove the template config_<environment>.json files
   if [[ ! -e $SERVER_CONFIG_JSON ]]; then
     echo "The file $SERVER_CONFIG_JSON cannot be created"
     exit 0