diff --git a/repeatersetup.cpp b/repeatersetup.cpp
index 9077363..fc9928e 100644
--- a/repeatersetup.cpp
+++ b/repeatersetup.cpp
@@ -25,6 +25,11 @@ repeaterSetup::repeaterSetup(QWidget *parent) :
 
 repeaterSetup::~repeaterSetup()
 {
+    // Trying this for more consistant destruction
+    rig.inputs.clear();
+    rig.preamps.clear();
+    rig.attenuators.clear();
+
     delete ui;
 }
 
diff --git a/repeatersetup.h b/repeatersetup.h
index 49e0808..2763a12 100644
--- a/repeatersetup.h
+++ b/repeatersetup.h
@@ -2,6 +2,7 @@
 #define REPEATERSETUP_H
 
 #include <QMainWindow>
+#include <QDebug>
 
 #include "repeaterattributes.h"
 #include "rigidentities.h"