diff -r 05bc53fe583b -r 83ca720e2b9a cmmanager/cmmgr/database/inc/datamobilitycommsdattypes.h
--- a/cmmanager/cmmgr/database/inc/datamobilitycommsdattypes.h	Tue Aug 31 15:35:44 2010 +0300
+++ b/cmmanager/cmmgr/database/inc/datamobilitycommsdattypes.h	Wed Sep 01 12:23:51 2010 +0100
@@ -43,7 +43,6 @@
 #define KCDTypeNameSNAPMetadataSNAP _S( "SNAP" )
 #define KCDTypeNameSNAPMetadataMetadata _S( "Metadata" )
 #define KCDTypeNameSNAPMetadataIcon _S( "Icon" )
-#define KCDTypeNameSNAPMetadataIconFileName _S( "IconFileName" )
 
 //Global bearer priorization table and fields
 #define KCDTypeNameGlobalService _S( "GlobalBearerTypePriorization" )
@@ -61,7 +60,6 @@
 #define KCDTypeNameIAPMetadataIAP _S( "IAP" )
 #define KCDTypeNameIAPMetadataMetadata _S( "Metadata" )
 #define KCDTypeNameIAPMetadataSeamlessness _S( "Seamlessness" )
-#define KCDTypeNameIAPMetadataIconFileName _S( "IconFileName" )
 
 //MIP4 table and fields
 #define KCDTypeNameMIP4 _S( "MIP4" )
@@ -126,7 +124,6 @@
 const CommsDat::TMDBElementId KCDTIdSNAPMetadataSNAP  = 0x00120000;
 const CommsDat::TMDBElementId KCDTIdSNAPMetadataMetadata  = 0x00130000;
 const CommsDat::TMDBElementId KCDTIdSNAPMetadataIcon  = 0x00140000;
-const CommsDat::TMDBElementId KCDTIdSNAPMetadataIconFileName  = 0x00150000;
 
     //mip service extension table
 const CommsDat::TMDBElementId KCDTIdMIPMIP4  = 0x00120000;
@@ -141,7 +138,6 @@
 const CommsDat::TMDBElementId KCDTIdIAPMetadataIAP  = 0x00120000;
 const CommsDat::TMDBElementId KCDTIdIAPMetadataMetadata  = 0x00130000;
 const CommsDat::TMDBElementId KCDTIdIAPMetadataSeamlessness  = 0x00140000;
-const CommsDat::TMDBElementId KCDTIdIAPMetadataIconFileName  = 0x00150000;
 
 //MIP4 Metadata
 const CommsDat::TMDBElementId KCDTIdMIP4HomeAddress = 0x00120000;
@@ -263,8 +259,7 @@
     public:
     CommsDat::CMDBField<TInt> iSNAP;
     CommsDat::CMDBField<TUint32> iMetadata;
-    CommsDat::CMDBField<TUint32> iIcon;         //< Not used.
-    CommsDat::CMDBField<TDesC> iIconFileName;   //< May contain path information also.
+    CommsDat::CMDBField<TUint32> iIcon;       
     
      private:
     
@@ -360,7 +355,6 @@
     CommsDat::CMDBRecordLink<CommsDat::CCDIAPRecord> iIAP;
     CommsDat::CMDBField<TUint32> iMetadata;
     CommsDat::CMDBField<TInt> iSeamlessness;
-    CommsDat::CMDBField<TDesC> iIconFileName;   //< May contain path information also.
 
      private:
     
@@ -479,8 +473,8 @@
     DATA_VTABLE
         
     public:
-    CommsDat::CMDBField<TUint> iDefConnType;    //< Not used.
-    CommsDat::CMDBField<TUint> iDefConnUid;     //< Not used.
+    CommsDat::CMDBField<TUint> iDefConnType;
+    CommsDat::CMDBField<TUint> iDefConnUid;    
     CommsDat::CMDBField<TUint> iUsageOfWlan;
     CommsDat::CMDBField<TUint> iCellularDataUsageHome;
     CommsDat::CMDBField<TUint> iCellularDataUsageVisitor;