--- a/locationmgmt/networkgateway/src/netgateway.cpp	Wed Sep 15 00:02:22 2010 +0300
+++ b/locationmgmt/networkgateway/src/netgateway.cpp	Wed Oct 13 16:07:50 2010 +0300
@@ -152,16 +152,11 @@
 	
 	iAdmin = CLbsAdmin::NewL();
 
-#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)
 		{
 		iNetworkLocationChannel = CNetworkLocationChannel::NewL(*this);