diff --git a/src/js/control-view.js b/src/js/control-view.js
index dab6ddf..b9589a3 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -373,7 +373,8 @@ module.exports = {
                     return;
             }
 
-            if(!this.config.gcodeList.some(item=> item == file.name)){
+            const isAlreadyPresent = this.config.gcodeList.find((element) => element == file.name);
+            if(isAlreadyPresent == undefined){
                 console.log('new gcode file');
                 this.config.gcodeList.push(file.name);
                 try {
diff --git a/src/js/macros.js b/src/js/macros.js
index a6423e5..f6a98da 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -42,9 +42,6 @@ module.exports = {
     updateNewGcode: function (event) {
       this.newGcode[this.tab - 1] = event.target.value;
     },
-    loadGcode: function (data) {
-      this.newGcode[this.tab - 1] = data;
-    },
     macrosList: function () {
       return this.config.macrosList.map((el) => el.gcode_file_name);
     },
@@ -61,12 +58,12 @@ module.exports = {
         });
         const text = (await response.text()).split(" ").join("\n");
         if (text.length > 20e6) {
-          this.loadGcode("File is large - gcode view disabled");
+          this.newGcode[this.tab - 1]="File is large - gcode view disabled";
         } else {
-          this.loadGcode(text);
+          this.newGcode[this.tab - 1]=text;
         }
       } else {
-        this.loadGcode("");
+        this.newGcode[this.tab - 1]="";
       }
       console.log(this.newGcode[this.tab - 1]);
     },
diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py
index 6d6ef0a..81f18b2 100644
--- a/src/py/bbctrl/Config.py
+++ b/src/py/bbctrl/Config.py
@@ -246,8 +246,3 @@ class Config(object):
         for name, tmpl in self.template.items():
             conf = config.get(name, None)
             self._encode(name, '', conf, tmpl, with_defaults)
-    
-    def set_gcodeList(self, filename):
-        self.set('selected', filename)
-        time = os.path.getmtime(self.ctrl.get_upload(filename))
-        self.set('selected_time', time)
diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py
index 4ddd08c..dbd6686 100644
--- a/src/py/bbctrl/FileHandler.py
+++ b/src/py/bbctrl/FileHandler.py
@@ -38,6 +38,10 @@ class FileHandler(bbctrl.APIHandler):
 
     def delete_ok(self, filename):
         self.get_log('FileHandler').info('filename ' + filename)
+        allFiles = self.get_ctrl().state.return_files(filename)
+        for file in allFiles:
+            self.get_log('FileHandler').info('filename ' + file)
+        
         if not filename:
             # Delete everything
             for path in glob.glob(self.get_upload('*')):