diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb
index acde2a7..3c5b82e 100644
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@@ -95,6 +95,8 @@ Public Class frmMain
         Dim SQL As String = "SELECT * FROM TBPMO_MENU_FORM"
         Dim dtRootMenu As DataTable = ClassDatabase.Return_Datatable(SQL)
 
+        pageForms.Groups.Clear()
+
         If dtRootMenu.Rows.Count <> 0 Then
 
             For Each row As DataRow In dtRootMenu.Rows
@@ -144,6 +146,10 @@ Public Class frmMain
         Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
         Dim image2 As Bitmap = LoadNoImage()
 
+        Do While 0 < groupQuickAccess.ItemLinks.Count
+            groupQuickAccess.ItemLinks.Remove(groupQuickAccess.ItemLinks(0))
+        Loop
+
         If dt.Rows.Count <> 0 Then
 
             For Each row As DataRow In dt.Rows
@@ -171,6 +177,11 @@ Public Class frmMain
         End If
 
         ' TODO: NUR FÜR WINDREAM CON!!!
+
+        Do While 0 < groupQuickAccessDemo.ItemLinks.Count
+            groupQuickAccessDemo.ItemLinks.Remove(groupQuickAccessDemo.ItemLinks(0))
+        Loop
+
         If dt.Rows.Count <> 0 Then
 
             For Each row As DataRow In dt.Rows