diff --git a/src/UI/AbstractDocumentView.cc b/src/UI/AbstractDocumentView.cc
index 70b1c2414dc47bcedeb9f80ccc13041f8c75d6b8..d56a35bd2e8523d1a0511f5843403cbfa9ae9389 100644
--- a/src/UI/AbstractDocumentView.cc
+++ b/src/UI/AbstractDocumentView.cc
@@ -34,7 +34,7 @@ AbstractDocumentView::deleteAllContent() noexcept
             delete item->widget();
             delete item;
         }
-        delete layout(); // XXX
+        delete layout();
     }
 }
 
diff --git a/src/UI/MainWindow.cc b/src/UI/MainWindow.cc
index dca4130d4fba97ec60b7d261b06c59362441a890..a322dab0a02a7191da1e4d559a10d415419e81a1 100644
--- a/src/UI/MainWindow.cc
+++ b/src/UI/MainWindow.cc
@@ -168,9 +168,7 @@ void
 MainWindow::closeEvent(QCloseEvent *event) noexcept
 {
     qDebug() << "Closing the main window!";
-    forEachViews<VivyDocumentView>(
-        [](VivyDocumentView *view, int) { view->closeDocument(); }); // XXX
-    // event->accept();
+    forEachViews<VivyDocumentView>([](VivyDocumentView *view, int) { view->closeDocument(); });
     QMainWindow::closeEvent(event);
 }
 
diff --git a/src/UI/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc
index 8bb95c5c29141f24eaa9a07d0a1d43d238416143..be7437916ed688742d5beeb24454295e5ea124b2 100644
--- a/src/UI/VivyDocumentView.cc
+++ b/src/UI/VivyDocumentView.cc
@@ -40,7 +40,8 @@ VivyDocumentView::~VivyDocumentView() noexcept
     qDebug()
         << "Deleting the document view: ref count on document" << document->getName() << "is"
         << document.use_count() << "and" << (visualizer ? "has visualizer" : "without visualizer");
-    closeDocument();
+
+    deleteAllContent();
 }
 
 VivyDocument *
@@ -148,12 +149,6 @@ VivyDocumentView::closeDocument() noexcept
              << document.use_count() << ")";
     vivyApp->documentStore.closeDocument(document->getUuid());
     allowToCloseAllDocks();
-
-    // Kubat: the visualizer pointer should have been deleted by the
-    // deleteAllContent() call if it was created.
-    // deleteAllContent();
-    // visualizer = nullptr;
-    // property   = nullptr;
 }
 
 QIcon