diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp
index e198da888..dc43bc83b 100644
--- a/src/zapit/src/descriptors.cpp
+++ b/src/zapit/src/descriptors.cpp
@@ -251,8 +251,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t
 	transponder_id_t TsidOnid;
 	int modulationSystem, modulationType, rollOff, fec_inner;
 
-	CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
-	if (frontend->getInfo()->type != FE_QPSK)
+	if (CFrontend::getInstance()->getInfo()->type != FE_QPSK)
 		return -1;
 
 	feparams.frequency =
@@ -316,8 +315,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t
 int cable_delivery_system_descriptor(const unsigned char * const buffer, t_transport_stream_id transport_stream_id, t_original_network_id original_network_id, t_satellite_position satellitePosition, freq_id_t freq)
 {
 	transponder_id_t TsidOnid;
-	CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
-	if (frontend->getInfo()->type != FE_QAM)
+	if (CFrontend::getInstance()->getInfo()->type != FE_QAM)
 		return -1;
 
 	FrontendParameters feparams;
@@ -444,9 +442,6 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
 	CZapitChannel *channel = NULL;
 	bool tpchange = false;
 	static transponder_id_t last_tpid = 0;
-	
-	static CPat pat;
-
 	//scrambled
 	if(free_ca && scan_fta_flag){
 		return;
@@ -629,8 +624,7 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
 				CZapitBouquet* bouquet;
 				int bouquetId;
 				char pname[100];
-				CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
-				if (frontend->getInfo()->type == FE_QPSK)
+				if (CFrontend::getInstance()->getInfo()->type == FE_QPSK)
 					snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str());
 				else
 					snprintf(pname, 100, "%s", providerName.c_str());
@@ -660,14 +654,10 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
 			break;
 	}
 	if(CZapit::getInstance()->scanPids()) {
-		if(tpchange) {
-			//parse_pat();
-			pat.Reset();
-			pat.Parse();
-		}
+		if(tpchange)
+			parse_pat();
 
 		channel->resetPids();
-#if 0
 		if(!pat_get_pmt_pid(channel)) {
 			if(!parse_pmt(channel)) {
 				//if(channel->getPreAudioPid() == 0 && channel->getVideoPid() == 0)
@@ -677,15 +667,6 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
 				}
 			}
 		}
-#endif
-		if(pat.Parse(channel)) {
-			CPmt pmt;
-			if(!pmt.parse_pmt(channel)) {
-				if ((channel->getPreAudioPid() != 0) || (channel->getVideoPid() != 0)) {
-					channel->setPidsFlag();
-				}
-			}
-		}
 	}
 	if(service_type == ST_DIGITAL_TELEVISION_SERVICE && !channel->scrambled) {
 		CZapit::getInstance()->SetCurrentChannelID(channel->getChannelID());
@@ -870,12 +851,11 @@ void subtitling_descriptor(const unsigned char * const)
 /* 0x5A */
 int terrestrial_delivery_system_descriptor(const unsigned char * const)
 {
-	/* TODO */
-#if 0
-	CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
-	if (frontend->getInfo()->type != FE_OFDM)
+	if (CFrontend::getInstance()->getInfo()->type != FE_OFDM)
 		return -1;
-#endif
+
+	/* TODO */
+
 	return 0;
 }