Index: Application/Application.Ringtoets/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r33e559da51ec6f6857b1cc1bb31c3863e84477a7 -rb122512eeb3c282818c0f7f387071c188f6c671d
--- Application/Application.Ringtoets/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 33e559da51ec6f6857b1cc1bb31c3863e84477a7)
+++ Application/Application.Ringtoets/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision b122512eeb3c282818c0f7f387071c188f6c671d)
@@ -1098,12 +1098,14 @@
 
         private void OnFileOptionsClicked(object sender, RoutedEventArgs e)
         {
-            var optionsDialog = new OptionsDialog.OptionsDialog();
-            var generalOptions = CreateGeneralOptions();
+            var optionsDialog = new OptionsDialog.OptionsDialog()
+            {
+                OptionsControls =
+                {
+                    CreateGeneralOptions()
+                }
+            };
 
-            var optionsControls = Gui.Plugins.SelectMany(p => p.OptionsControls);
-            optionsDialog.OptionsControls.AddRange(optionsControls.Plus(generalOptions));
-
             optionsDialog.ShowDialog();
         }
 
Index: Core/Common/src/Core.Common.Gui/GuiPlugin.cs
===================================================================
diff -u -r9a359b152f2e3be09ad50d7644179b4391958cae -rb122512eeb3c282818c0f7f387071c188f6c671d
--- Core/Common/src/Core.Common.Gui/GuiPlugin.cs	(.../GuiPlugin.cs)	(revision 9a359b152f2e3be09ad50d7644179b4391958cae)
+++ Core/Common/src/Core.Common.Gui/GuiPlugin.cs	(.../GuiPlugin.cs)	(revision b122512eeb3c282818c0f7f387071c188f6c671d)
@@ -4,7 +4,6 @@
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Gui.Forms;
-using Core.Common.Gui.Forms.OptionsDialog;
 
 namespace Core.Common.Gui
 {
@@ -47,17 +46,6 @@
         }
 
         /// <summary>
-        /// 
-        /// </summary>
-        public virtual IEnumerable<IOptionsControl> OptionsControls
-        {
-            get
-            {
-                yield break;
-            }
-        }
-
-        /// <summary>
         /// Provides custom object map layers.
         /// </summary>
         public virtual IMapLayerProvider MapLayerProvider