diff --git a/src/zapit/include/zapit/frontend_c.h b/src/zapit/include/zapit/frontend_c.h
index 64d909c7c..ec89fb384 100644
--- a/src/zapit/include/zapit/frontend_c.h
+++ b/src/zapit/include/zapit/frontend_c.h
@@ -100,7 +100,7 @@ class CFrontend
 		/* current adapter where this frontend is on */
 		int adapter;
 		/* current frontend instance */
-		static CFrontend *currentFe;
+		//static CFrontend *currentFe;
 		bool locked;
 		/* tuning finished flag */
 		bool tuned;
@@ -159,7 +159,7 @@ class CFrontend
 		/* Private constructor */
 		CFrontend(int Number = 0, int Adapter = 0);
 
-		static CFrontend *getInstance(int Number = 0, int Adapter = 0);
+		//static CFrontend *getInstance(int Number = 0, int Adapter = 0);
 		friend class CFEManager;
 	public:
 		~CFrontend(void);
diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index bee4b23cd..7e8f298e7 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -137,6 +137,7 @@ typedef enum dvb_fec {
 #define TIME_STEP 200
 #define TIMEOUT_MAX_MS (feTimeout*100)
 /*********************************************************************************************************/
+#if 0
 // Global fe instance
 CFrontend *CFrontend::currentFe = NULL;
 
@@ -148,7 +149,7 @@ CFrontend *CFrontend::getInstance(int Number, int Adapter)
 	}
 	return currentFe;
 }
-
+#endif
 CFrontend::CFrontend(int Number, int Adapter)
 {
 	printf("[fe%d] New frontend on adapter %d\n", Number, Adapter);
@@ -239,6 +240,8 @@ void CFrontend::Close(void)
 	if(standby)
 		return;
 
+	printf("[fe%d] close frontend\n", fenumber);
+
 	if (!slave && config.diseqcType > MINI_DISEQC)
 		sendDiseqcStandby();