diff -r 7333d7932ef7 -r 8b7f4e561641 ncdengine/engine/accesspointmanager/src/catalogsaccesspointsettings.cpp
--- a/ncdengine/engine/accesspointmanager/src/catalogsaccesspointsettings.cpp	Tue Aug 31 15:21:33 2010 +0300
+++ b/ncdengine/engine/accesspointmanager/src/catalogsaccesspointsettings.cpp	Wed Sep 01 12:22:02 2010 +0100
@@ -52,19 +52,15 @@
     delete iLongTextData;
     delete iText16Data;
     delete iText8Data;
-
-#ifdef _0
     iLongTextMembers.Close();
     iText16Members.Close();
     iText8Members.Close();
     iUintMembers.Close();
     iBoolMembers.Close();
     iUintData.Close();
-    iBoolData.Close(); 
-#endif  
+    iBoolData.Close();    
     }
     
-#ifdef _0
 void CCatalogsAccessPointSettings::SetLongTextParameterL(
     const TApMember& aKey, const TDesC& aValue) 
     {
@@ -218,13 +214,11 @@
     aKey = iBoolMembers[aIndex];
     aValue = iBoolData[aIndex];
     }
-#endif
-
-void CCatalogsAccessPointSettings::ExternalizeL(RWriteStream& /* aStream */) 
+        
+void CCatalogsAccessPointSettings::ExternalizeL(RWriteStream& aStream) 
     {
     DLTRACEIN((""));
     
-#ifdef _0
     // write long text parameters
     TInt longTextCount = LongTextParameterCount();
     aStream.WriteInt32L(longTextCount);
@@ -269,15 +263,12 @@
         aStream.WriteInt32L(iBoolMembers[i]);
         aStream.WriteInt8L(iBoolData[i]);
         }
-
-#endif
+    
     DLTRACEOUT((""));        
     }
     
-void CCatalogsAccessPointSettings::InternalizeL(RReadStream& /* aStream */) 
+void CCatalogsAccessPointSettings::InternalizeL(RReadStream& aStream) 
     {
-    
-#ifdef _0
     // read long text parameters
     TInt longTextCount = aStream.ReadInt32L();
     iLongTextMembers.ReserveL(longTextCount);
@@ -336,6 +327,4 @@
         iBoolMembers.AppendL((TApMember)aStream.ReadInt32L());
         iBoolData.AppendL(aStream.ReadInt8L());
         }
-       
-#endif
     }