diff --git a/src/js/control-view.js b/src/js/control-view.js
index 4528986..314c732 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -420,7 +420,7 @@ module.exports = {
         },
 
         delete_all_except_macros: function() {
-            const macrosList=this.config.macros.map(item=>item.gcode_file_name).toString();
+            const macrosList=this.config.macrosList.map(item=>item.gcode_file_name).toString();
             api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`);
             this.deleteGCode = false;
         },
diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py
index 8396968..56faba7 100644
--- a/src/py/bbctrl/FileHandler.py
+++ b/src/py/bbctrl/FileHandler.py
@@ -40,15 +40,16 @@ class FileHandler(bbctrl.APIHandler):
         allFiles = self.get_ctrl().state.return_files()
 
         if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
-            macrosList=filename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
-            self.get_log('FileHandler').info('macrosList ' + macrosList)
+            macrosList=filename.replace('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
+            self.get_log('FileHandler').info('macrosList ' + macrosList).split(',')
 
-            # filename = os.path.basename(filename)
-            # self.get_log('FileHandler').info('filenamed ' + filename)
-            # self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename))
-            # safe_remove(self.get_upload(filename))
-            # self.get_ctrl().preplanner.delete_plans(filename)
-            # self.get_ctrl().state.remove_file(filename)
+            for filename in [item for item in allFiles if item not in macrosList]:
+                filename = os.path.basename(filename)
+                self.get_log('FileHandler').info('filenamed ' + filename)
+                self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename))
+                safe_remove(self.get_upload(filename))
+                self.get_ctrl().preplanner.delete_plans(filename)
+                self.get_ctrl().state.remove_file(filename)
         
         elif not filename:
             # Delete everything