diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 75a4101f4..892209e7f 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -152,15 +152,12 @@
 
 int old_b_id = -1;
 CHintBox * reloadhintBox = 0;
-uint32_t sec_timer;
-int rf_dummy;
+// int rf_dummy; 
 bool has_hdd;
 #include "gui/infoclock.h"
-#include "gui/dboxinfo.h"
 CInfoClock      *InfoClock;
 int allow_flash = 1;
 extern int was_record;
-extern char current_timezone[50];
 Zapit_config zapitCfg;
 char zapit_lat[20];
 char zapit_long[20];
@@ -189,8 +186,6 @@ void * zapit_main_thread(void *data);
 extern t_channel_id live_channel_id; //zapit
 extern t_channel_id rec_channel_id; //zapit
 extern CZapitChannel *g_current_channel;
-// void setZapitConfig(Zapit_config * Cfg);
-void getZapitConfig(Zapit_config *Cfg);
 
 void * nhttpd_main_thread(void *data);
 static pthread_t nhttpd_thread ;
@@ -963,8 +958,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 		}
 	}
 #endif
-	//scan settings
-	if(!scanSettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) {
+	//scansettings
+	if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) {
 		dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n");
 	}
 
@@ -4206,8 +4201,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
 		} else
 			tuxtxt_close();
 		
-		CScanSetup::getInstance()->exec(NULL, "save_scansettings");
-
 		//g_Sectionsd->setEventsAreOldInMinutes((unsigned short) (g_settings.epg_old_hours*60));
 		//g_Sectionsd->setHoursToCache((unsigned short) (g_settings.epg_cache_days*24));
 
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index cb30651c8..be88dc8ad 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -81,24 +81,12 @@
 #include "gui/widget/stringinput.h"
 #include "gui/widget/stringinput_ext.h"
 
-#include <zapit/fastscan.h>
-#include <zapit/frontend_c.h>
-#include <zapit/getservices.h>
-#include <zapit/satconfig.h>
-
-
-extern CFrontend * frontend;
-extern CAudioPlayerGui * audioPlayer;
 extern CPlugins       * g_PluginList;
-extern bool has_hdd;
-extern CZapitClient::SatelliteList satList;
-extern Zapit_config zapitCfg;
-extern char zapit_lat[20];
-extern char zapit_long[20];
-extern char current_timezone[50];
 extern CRemoteControl * g_RemoteControl;
 extern CCAMMenuHandler * g_CamHandler;
-extern bool autoshift;
+// extern bool has_hdd;
+// extern char current_timezone[50];
+// extern bool autoshift;
 
 
 /**************************************************************************************
@@ -222,11 +210,11 @@ const CMenuOptionChooser::keyval FLASHUPDATE_UPDATEMODE_OPTIONS[FLASHUPDATE_UPDA
 	{ 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET }
 };
 
-void getZapitConfig(Zapit_config *Cfg);
-void CNeutrinoApp::InitServiceSettings(CMenuWidget &service/*, CMenuWidget &_scanSettings*/)
+
+void CNeutrinoApp::InitServiceSettings(CMenuWidget &service)
 {
 	dprintf(DEBUG_DEBUG, "init serviceSettings\n");
- 	getZapitConfig(&zapitCfg);
+
 
 #if 0
 	CZapitDestExec * zexec = new CZapitDestExec();