diff --git a/linux/massStorageCopy b/linux/massStorageCopy
index a5f7bd29..8467d5f5 100755
Binary files a/linux/massStorageCopy and b/linux/massStorageCopy differ
diff --git a/macosx/massStorageCopyMacOsX b/macosx/massStorageCopyMacOsX
index e67acb81..c6cc9fbd 100755
Binary files a/macosx/massStorageCopyMacOsX and b/macosx/massStorageCopyMacOsX differ
diff --git a/src/massStorageCopy/Makefile b/src/massStorageCopy/Makefile
deleted file mode 100644
index a2b6023a..00000000
--- a/src/massStorageCopy/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-all: massStorageCopy32 massStorageCopy
-
-
-massStorageCopy32: massStorageCopy32.o
-	gcc -m32 -o $@ $<
-
-massStorageCopy32.o: massStorageCopy.c
-	gcc -m32 -c $<
-	mv massStorageCopy.o massStorageCopy32.o
-     
-massStorageCopy: massStorageCopy.o
-	gcc -o $@ $<
-
-massStorageCopy.o: massStorageCopy.c
-	gcc -c $<
-
-clean:
-	rm -f *.o massStorageCopy massStorageCopy32
-
-install:
-	mv massStorageCopy ../../linux64/
-	mv massStorageCopy32 ../../linux/massStorageCopy
diff --git a/src/massStorageCopy/massStorageCopy.c b/src/massStorageCopy/massStorageCopy.c
deleted file mode 100644
index 2308c35e..00000000
--- a/src/massStorageCopy/massStorageCopy.c
+++ /dev/null
@@ -1,157 +0,0 @@
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <mntent.h>
-#include <unistd.h>
-#include <errno.h>
-#include <ctype.h>
-
-static char *input_path = NULL;
-static char *output_path = NULL;
-static char *output_dev = NULL;
-static char **list_output_dev = NULL;
-static char *cmd = NULL;
-static FILE *aFile = NULL;
-
-void usage(char *name)
-{
-  printf("Usage: %s [-I <filepath>] [-O <mountpoint(s)> ]\n\n", name);
-  printf("Mandatory options:\n");
-  printf("\t-I: filepath binary to copy\n");
-  printf("\t-O: mountpoint(s) destination name.\n");
-  printf("\t    Could be a list (separated by','). Ex: \"NODE_1,NODE2,NODE_3\"\n");
-}
-
-void free_ressource()
-{
-  if(input_path)
-    free(input_path);
-  if(output_path)
-    free(output_path);
-  if(output_dev)
-    free(output_dev);
-  if(list_output_dev)
-    free(list_output_dev);
-  if(cmd)
-    free(cmd);
-  if(aFile)
-    endmntent(aFile);
-}
-
-int main(int argc, char *argv[])
-{
-  int c, i;
-  int ret = 0;
-  int device_found = 0;
-  struct mntent *ent = NULL;
-  char *p = NULL;
-  int n_output_dev = 0;
-  char scp_cmd[]="scp";
-
-  opterr = 0;
-
-  while ((c = getopt (argc, argv, "I:O:")) != -1)
-    switch (c)
-      {
-      case 'I':
-        input_path = malloc(strlen(optarg)+1);
-		if(input_path != NULL)
-          strcpy(input_path, optarg);
-        break;
-      case 'O':
-        output_dev = malloc(strlen(optarg)+1);
-		if(output_dev != NULL)
-          strcpy(output_dev, optarg);
-        break;
-      case '?':
-        if ((optopt == 'I') || (optopt == 'O'))
-          fprintf (stderr, "Option -%c requires an argument.\n", optopt);
-        else if (isprint (optopt))
-          fprintf (stderr, "Unknown option `-%c'.\n", optopt);
-        else
-          fprintf (stderr,
-                   "Unknown option character `\\x%x'.\n",
-                   optopt);
-		usage(argv[0]);
-        free_ressource();
-        return EINVAL;
-      default:
-        abort ();
-      }
-
-  if((input_path == NULL) || (output_dev == NULL))
-  {
-    free_ressource();
-	exit(ENOMEM);
-  }
-
-  if (strlen(input_path) && strlen(output_dev))
-  {
-    /* get the mounted devices list */
-    aFile = setmntent("/proc/mounts", "r");
-    if (aFile == NULL) {
-      perror("setmntent");
-      free_ressource();
-      exit(ENOENT);
-    }
-
-	p = strtok (output_dev, ",\"");
-
-    /* split output_dev and append tokens to list_output_dev */
-    while (p) {
-      list_output_dev = realloc (list_output_dev, sizeof (char*) * ++n_output_dev);
-
-      if (list_output_dev == NULL)
-        exit (ENOMEM);
-
-      list_output_dev[n_output_dev-1] = p;
-
-      p = strtok (NULL, ",\"");
-    }
-
-    /* realloc one extra element for the last NULL */
-    list_output_dev = realloc (list_output_dev, sizeof (char*) * (n_output_dev+1));
-    list_output_dev[n_output_dev] = 0;
-
-	/* now lets read the path of the device */
-    while ((NULL != (ent = getmntent(aFile))) && (!device_found)) {
-      for (i = 0; (i < (n_output_dev)) && (!device_found); ++i) {
-        if (strstr(ent->mnt_dir, list_output_dev[i])) {
-          output_path = malloc(strlen(ent->mnt_dir)+1);
-          if(output_path != NULL) {
-            sprintf(output_path, "%s", ent->mnt_dir);
-          } else {
-            free_ressource();
-            exit(ENOMEM);
-          }
-          device_found = 1;
-        }
-      }
-    }
-
-    if(device_found) {
-      printf("copying %s to %s\n", input_path, output_path);
-      cmd = malloc(strlen(scp_cmd)+1+strlen(input_path)+1+strlen(output_path)+1);
-      if(cmd != NULL) {
-        sprintf(cmd, "%s %s %s", scp_cmd, input_path, output_path);
-      } else {
-        free_ressource();
-        exit(ENOMEM);
-     }
-     ret = system(cmd);
-
-    } else {
-      printf("%s not found. Please ensure the device is correctly connected\n",
-                output_dev);
-      ret = ENODEV;
-    }
-  }
-  else
-  {
-    printf("Missing argument\n");
-    usage(argv[0]);
-  }
-  free_ressource();
-  return ret;
-}
diff --git a/src/massStorageCopy/massStorageCopyMacOsX.c b/src/massStorageCopy/massStorageCopyMacOsX.c
deleted file mode 100644
index a444cbbe..00000000
--- a/src/massStorageCopy/massStorageCopyMacOsX.c
+++ /dev/null
@@ -1,158 +0,0 @@
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/mount.h>
-#include <getopt.h>
-#include <ctype.h>
-#include <errno.h>
-
-#define MAX_FS 128
-
-static char *input_path = NULL;
-static char *output_path = NULL;
-static char *output_dev = NULL;
-static char **list_output_dev = NULL;
-static char *cmd = NULL;
-
-
-void usage(char *name)
-{
-  printf("Usage: %s [-I <filepath>] [-O <mountpoint(s)> ]\n\n", name);
-  printf("Mandatory options:\n");
-  printf("\t-I: filepath binary to copy\n");
-  printf("\t-O: mountpoint(s) destination name.\n");
-  printf("\t    Could be a list (separated by','). Ex: \"NODE_1,NODE2,NODE_3\"\n");
-}
-
-
-void free_ressource()
-{
-  if(input_path)
-    free(input_path);
-  if(output_path)
-    free(output_path);
-  if(output_dev)
-    free(output_dev);
-  if(list_output_dev)
-    free(list_output_dev);
-  if(cmd)
-    free(cmd);
-}
-
-int main(int argc, char *argv[])
-{
-  int c, i, n;
-  int ret = 0;
-  int device_found = 0;
-  struct statfs buf[MAX_FS];
-  int fs_count;
-  char *p = NULL;
-  int n_output_dev = 0;
-  char scp_cmd[]="scp";
-
-  opterr = 0;
-
-  while ((c = getopt (argc, argv, "I:O:")) != -1) {
-    switch (c)
-    {
-    case 'I':
-      input_path = malloc(strlen(optarg)+1);
-      if(input_path != NULL)
-        strcpy(input_path, optarg);
-      break;
-    case 'O':
-      output_dev = malloc(strlen(optarg)+1);
-      if(output_dev != NULL)
-        strcpy(output_dev, optarg);
-      break;
-    case '?':
-      if ((optopt == 'I') || (optopt == 'O'))
-        fprintf (stderr, "Option -%c requires an argument.\n", optopt);
-      else if (isprint (optopt))
-        fprintf (stderr, "Unknown option `-%c'.\n", optopt);
-      else
-        fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt);
-      usage(argv[0]);
-      free_ressource();
-      return EINVAL;
-    default:
-      abort ();
-    }
-  }
-
-  if((input_path == NULL) || (output_dev == NULL))
-  {
-    free_ressource();
-    exit(ENOMEM);
-  }
-
-  if(strlen(input_path) && strlen(output_dev))
-  {
-    /* get the mounted devices list */
-    fs_count = getfsstat(NULL,0,MNT_WAIT);
-    if(fs_count < 0) {
-      perror("getfsstat");
-      free_ressource();
-      exit(ENOENT);
-    }
-
-    getfsstat(buf,fs_count*sizeof(buf[0]),MNT_WAIT);
-
-    /*  " must be removed too */
-    p = strtok (output_dev, ",\"");
-
-    /* split output_dev and append tokens to list_output_dev */
-    while (p) {
-      list_output_dev = realloc (list_output_dev, sizeof (char*) * ++n_output_dev);
-
-      if (list_output_dev == NULL)
-        exit (ENOMEM);
-
-      list_output_dev[n_output_dev-1] = p;
-
-      p = strtok (NULL, ",\"");
-    }
-
-    /* realloc one extra element for the last NULL */
-    list_output_dev = realloc (list_output_dev, sizeof (char*) * (n_output_dev+1));
-    list_output_dev[n_output_dev] = 0;
-
-    for(n = 0; (n < fs_count) && (!device_found); n++) {
-      for(i = 0; (i < n_output_dev) && (!device_found); i++) {
-        if(strstr(buf[n].f_mntonname,list_output_dev[i])) {
-          output_path = malloc(strlen(buf[n].f_mntonname)+1);
-          if(output_path != NULL) {
-            sprintf(output_path, "%s", buf[n].f_mntonname);
-          } else {
-            free_ressource();
-            exit(ENOMEM);
-          }
-          device_found = 1;
-        }
-      }
-    }
-
-    if(device_found) {
-      printf("copying %s to %s\n", input_path, output_path);
-      cmd = malloc(strlen(scp_cmd)+1+strlen(input_path)+1+strlen(output_path)+1);
-      if(cmd != NULL) {
-        sprintf(cmd, "%s %s %s", scp_cmd, input_path, output_path);
-      } else {
-        free_ressource();
-        exit(ENOMEM);
-      }
-      ret = system(cmd);
-    } else {
-      printf("%s not found. Please ensure the device is correctly connected\n",
-                output_dev);
-      ret = ENODEV;
-    }
-  } else {
-    printf("Missing argument\n");
-    usage(argv[0]);
-  }
-
-  free_ressource();
-  return ret;
-}