diff --git a/include-gpl/mainwindow.h b/include-gpl/mainwindow.h
index 0f0b48106..691c98462 100644
--- a/include-gpl/mainwindow.h
+++ b/include-gpl/mainwindow.h
@@ -120,7 +120,6 @@ private slots:
 	void on_dcOffset_toggled(bool checked);
 	void on_iqImbalance_toggled(bool checked);
 	void on_action_View_Fullscreen_toggled(bool checked);
-	void on_actionOsmoSDR_Firmware_Upgrade_triggered();
 	void on_presetSave_clicked();
 	void on_presetLoad_clicked();
 	void on_presetDelete_clicked();
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index c6a457163..5c09b2dca 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -339,8 +339,6 @@ void MainWindow::updateStatus()
 				m_engineRunning->setColor(Qt::gray);
 				m_engineError->setColor(Qt::gray);
 				statusBar()->clearMessage();
-				//if(m_startOsmoSDRUpdateAfterStop)
-				//	on_actionOsmoSDR_Firmware_Upgrade_triggered();
 				break;
 
 			case DSPEngine::StRunning:
@@ -355,8 +353,6 @@ void MainWindow::updateStatus()
 				m_engineRunning->setColor(Qt::gray);
 				m_engineError->setColor(Qt::red);
 				statusBar()->showMessage(tr("Error: %1").arg(m_dspEngine->errorMessage()));
-				//if(m_startOsmoSDRUpdateAfterStop)
-				//	on_actionOsmoSDR_Firmware_Upgrade_triggered();
 				break;
 		}
 		m_lastEngineState = state;
@@ -399,23 +395,6 @@ void MainWindow::on_action_View_Fullscreen_toggled(bool checked)
 	else showNormal();
 }
 
-void MainWindow::on_actionOsmoSDR_Firmware_Upgrade_triggered()
-{
-#if 0
-	DSPEngine::State engineState = m_dspEngine->state();
-	if((engineState != DSPEngine::StIdle) && (engineState != DSPEngine::StError)) {
-		m_startOsmoSDRUpdateAfterStop = true;
-		m_dspEngine->stopAcquistion();
-		return;
-	}
-	m_startOsmoSDRUpdateAfterStop = false;
-/* TODO: osmosdr upgrade
-	OsmoSDRUpgrade osmoSDRUpgrade;
-	osmoSDRUpgrade.exec();
-	*/
-#endif
-}
-
 void MainWindow::on_presetSave_clicked()
 {
 	QStringList groups;
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index 94f5ec8e9..9ff0fb29a 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -73,9 +73,6 @@
     <property name="title">
      <string>&amp;Help</string>
     </property>
-    <!--addaction name="action_Open_Website"/>
-    <addaction name="action_Check_for_Update"/>
-    <addaction name="separator"/-->
     <addaction name="action_Loaded_Plugins"/>
     <addaction name="separator"/>
     <addaction name="action_About"/>
@@ -94,7 +91,6 @@
    <addaction name="menu_View"/>
    <addaction name="menu_Acquisition"/>
    <addaction name="menu_Channels"/>
-   <!--addaction name="menu_Options"/-->
    <addaction name="menu_Window"/>
    <addaction name="menu_Help"/>
   </widget>
@@ -365,11 +361,6 @@
     <string>F11</string>
    </property>
   </action>
-  <!--action name="actionOsmoSDR_Firmware_Upgrade">
-   <property name="text">
-    <string>OsmoSDR &amp;Firmware Upgrade...</string>
-   </property>
-  </action-->
   <action name="action_Oscilloscope">
    <property name="checkable">
     <bool>true</bool>
@@ -386,31 +377,11 @@
     <string>&amp;About SDRangelove...</string>
    </property>
   </action>
-  <action name="action_Open_Website">
-   <property name="text">
-    <string>&amp;Open Website</string>
-   </property>
-  </action>
-  <action name="action_Check_for_Update">
-   <property name="text">
-    <string>Check for &amp;Update...</string>
-   </property>
-  </action>
   <action name="action_Preferences">
    <property name="text">
     <string>&amp;Preferences...</string>
    </property>
   </action>
-  <!--action name="action_Demod_NFM">
-   <property name="text">
-    <string>N&amp;FM</string>
-   </property>
-  </action>
-  <action name="action_Demod_SSB">
-   <property name="text">
-    <string>&amp;SSB</string>
-   </property>
-  </action-->
   <action name="action_Loaded_Plugins">
    <property name="text">
     <string>Loaded &amp;Plugins...</string>