diff --git a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
index a6f803aa..bb39b672 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
+++ b/EgtBEAMWALL.Optimizer/MainMenu/MainMenuVM.vb
@@ -2,7 +2,6 @@
 Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtBEAMWALL.DataLayer.DatabaseModels
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -25,7 +24,7 @@ Public Class MainMenuVM
    Private m_SendFeedbackIsEnabled As Boolean = True
    Public ReadOnly Property SendFeedbackIsEnabled As Boolean
       Get
-         Return m_SelPage = Pages.VIEW Or m_SelPage = Pages.MACHINING Or m_SelPage = Pages.ONLYPRODPAGE
+         Return m_SelPage = Pages.ONLYPRODPAGE
       End Get
    End Property
 
@@ -81,7 +80,6 @@ Public Class MainMenuVM
       Select Case m_SelPage
          Case Pages.CONFIG
             bOk = ExitCONFIG()
-            SetbOpenProject(True)
          Case Pages.ONLYPRODPAGE
             bOk = ExitONLYPRODPAGE(bVerifyModification)
       End Select
@@ -101,23 +99,6 @@ Public Class MainMenuVM
       NotifyPropertyChanged(NameOf(OnlyProdPage_IsChecked))
    End Sub
 
-   Public ReadOnly Property OnlyProdPage_Visibility As Visibility
-      Get
-         Return If(Map.refMainWindowVM.MainWindowM.bOnlyProd, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Private m_bOpenProject As Boolean = False
-   Public ReadOnly Property bOpenProject As Boolean
-      Get
-         Return bOpenProject
-      End Get
-   End Property
-   Friend Sub SetbOpenProject(value As Boolean)
-      m_bOpenProject = value
-      NotifyPropertyChanged(NameOf(bOpenProject))
-   End Sub
-
 #Region "Messages"
 
    Public ReadOnly Property Viewer_Msg As String
diff --git a/EgtBEAMWALL.Optimizer/MainMenu/OnlyProdMainMenuV.xaml b/EgtBEAMWALL.Optimizer/MainMenu/OnlyProdMainMenuV.xaml
index 031e86ac..6f8820bd 100644
--- a/EgtBEAMWALL.Optimizer/MainMenu/OnlyProdMainMenuV.xaml
+++ b/EgtBEAMWALL.Optimizer/MainMenu/OnlyProdMainMenuV.xaml
@@ -15,7 +15,6 @@
 
       <RadioButton Content="{Binding OnlyProdPage_Msg}"
                    IsChecked="{Binding OnlyProdPage_IsChecked}"
-                   Visibility="{Binding OnlyProdPage_Visibility}"
                    Style="{StaticResource OnlyProdMainMenu_ToggleButton}"
                    Width="120"/>