diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index c7d8436ef..9ae613ebd 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -891,41 +891,17 @@ EditorPanel::~EditorPanel ()
     delete vboxright;
 
     //delete saveAsDialog;
-    if (catalogPane) {
-        delete catalogPane;
-    }
-
-    if (iTopPanel_1_Show) {
-        delete iTopPanel_1_Show;
-    }
-
-    if (iTopPanel_1_Hide) {
-        delete iTopPanel_1_Hide;
-    }
-
-    if (iHistoryShow) {
-        delete iHistoryShow;
-    }
-
-    if (iHistoryHide) {
-        delete iHistoryHide;
-    }
-
-    if (iBeforeLockON) {
-        delete iBeforeLockON;
-    }
-
-    if (iBeforeLockOFF) {
-        delete iBeforeLockOFF;
-    }
-
-    if (iRightPanel_1_Show) {
-        delete iRightPanel_1_Show;
-    }
-
-    if (iRightPanel_1_Hide) {
-        delete iRightPanel_1_Hide;
-    }
+    delete catalogPane;
+    delete iTopPanel_1_Show;
+    delete iTopPanel_1_Hide;
+    delete iHistoryShow;
+    delete iHistoryHide;
+    delete iBeforeLockON;
+    delete iBeforeLockOFF;
+    delete iRightPanel_1_Show;
+    delete iRightPanel_1_Hide;
+    delete iShowHideSidePanels_exit;
+    delete iShowHideSidePanels;
 }
 
 void EditorPanel::leftPaneButtonReleased (GdkEventButton *event)
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 2db0ef192..9f5357644 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -458,10 +458,9 @@ RTWindow::~RTWindow()
     g_object_unref (osxApp);
 #endif
 
-    if (fpanel) {
-        delete fpanel;
-    }
-
+    delete fpanel;
+    delete iFullscreen;
+    delete iFullscreen_exit;
     RTImage::cleanup();
 }