--- a/locationrequestmgmt/networkrequesthandler/src/lbsnetworkrequesthandler.cpp	Wed Sep 15 00:02:22 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/src/lbsnetworkrequesthandler.cpp	Wed Oct 13 16:07:50 2010 +0300
@@ -92,18 +92,12 @@
     													iNetRegStatus);
 
     iNrhServer->SetPrivacyServerObserver(iPrivLocHandler->PrivacyHandler());
-
-#if defined __WINSCW__ && defined SYMBIAN_CELLMO_CENTRIC
-	TBool locationManagementSupported(EFalse);
-#else
+    
 #ifdef SYMBIAN_FEATURE_MANAGER
 	TBool locationManagementSupported = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KLocationManagement);
 #else
 	TBool locationManagementSupported(ETrue);
-#endif // SYMBIAN_FEATURE_MANAGER
-#endif // __WINSCW__ && defined SYMBIAN_CELLMO_CENTRIC
-    
-
+#endif
 	if(locationManagementSupported)
 		{
 		iX3pHandler = CX3pHandler::NewL(*iNgMessageSwitch, iPrivLocHandler->X3pStatusHandler(), *iAdmin);