Index: trunk/zoo-project/zoo-kernel/service_internal_ms.c
===================================================================
--- trunk/zoo-project/zoo-kernel/service_internal_ms.c	(revision 759)
+++ trunk/zoo-project/zoo-kernel/service_internal_ms.c	(revision 760)
@@ -669,7 +669,4 @@
     if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
       return -1;
-#if MS_VERSION_MAJOR<7
-    myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
-#endif
     if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
       return -1;
@@ -920,7 +917,4 @@
 	    if(initClass((myLayer->CLASS[myLayer->numclasses])) == -1)
 	      return -1;
-#if MS_VERSION_MAJOR<7
-	    myLayer->CLASS[myLayer->numclasses]->type = myLayer->type;
-#endif
 	    if(msGrowClassStyles(myLayer->CLASS[myLayer->numclasses]) == NULL)
 	      return -1;
Index: trunk/zoo-project/zoo-kernel/service_internal_saga.c
===================================================================
--- trunk/zoo-project/zoo-kernel/service_internal_saga.c	(revision 759)
+++ trunk/zoo-project/zoo-kernel/service_internal_saga.c	(revision 760)
@@ -443,5 +443,4 @@
 		  for(int i=0; i<param->asList()->Get_Count(); i++)
 		    {
-		      fileNames[i].Trim();
 		      if( i < nFileNames )
 			{