diff --git a/adm/UDLIST b/adm/UDLIST
index c24cc57fe3..57729e760e 100644
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -272,8 +272,6 @@ p ObjMgt
 p PBRep
 p PCDM
 p PCDMShape
-p PColPGeom
-p PColPGeom2d
 p PColStd
 p PColgp
 p PCollection
diff --git a/src/Geom/Geom.cdl b/src/Geom/Geom.cdl
index 2e9ab11186..9dd1235044 100644
--- a/src/Geom/Geom.cdl
+++ b/src/Geom/Geom.cdl
@@ -63,24 +63,6 @@ exception UndefinedValue inherits DomainError from  Standard;
     class HSequenceOfBSplineSurface 
     	instantiates HSequence from TCollection (BSplineSurface from Geom,
     	    	    	    	SequenceOfBSplineSurface from Geom);
---    class SequenceOfBoundedSurface 
---    	instantiates Sequence from TCollection (BoundedSurface from Geom); 
-
-    class SequenceOfSurface 
-    	instantiates Sequence from TCollection (Surface from Geom);
-	
-    class HSequenceOfSurface 
-    	instantiates HSequence from TCollection (Surface from Geom,
-    	    	    	    	SequenceOfSurface from Geom);
-				
---    class HSequenceOfBoundedSurface 
---    	instantiates HSequence from TCollection (BoundedSurface from Geom,
---    	    	    	    	SequenceOfBoundedSurface from Geom);
---  class SequenceNodeOfSequenceOfSurface
---    	instantiates SeqNode from TCollection (Surface from Geom);
---  class HSequenceOfSurface 
---    	instantiates HSequence from TCollection (Surface from Geom,
---    	    	    	    	SequenceOfSurface from Geom);
 
         ---Group: Geometric entities 
 
diff --git a/src/PColPGeom/PColPGeom.cdl b/src/PColPGeom/PColPGeom.cdl
deleted file mode 100644
index 17f6de76d0..0000000000
--- a/src/PColPGeom/PColPGeom.cdl
+++ /dev/null
@@ -1,64 +0,0 @@
--- Created on: 1993-06-03
--- Created by: fid
--- Copyright (c) 1993-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-package PColPGeom 
-
-        ---Purpose : This package  is used to  instantiate of  several
-        --         generic classes from  the package  PCollection with
-        --         objects from the package PGeom.
-
-uses PCollection, PGeom
-
-is
-
-
-    class HArray1OfCurve 
-    	instantiates HArray1 from PCollection (Curve from PGeom);
-    class HArray1OfBoundedCurve 
-    	instantiates HArray1 from PCollection (BoundedCurve from PGeom);
-    class HArray1OfBezierCurve 
-    	instantiates HArray1 from PCollection (BezierCurve from PGeom);
-    class HArray1OfBSplineCurve 
-    	instantiates HArray1 from PCollection (BSplineCurve from PGeom);
-    class HArray1OfSurface 
-    	instantiates HArray1 from PCollection (Surface from PGeom);
-    class HArray1OfBoundedSurface 
-    	instantiates HArray1 from PCollection (BoundedSurface from PGeom);
-
-
-
-    class HArray2OfSurface 
-    	instantiates HArray2 from PCollection (Surface from PGeom);
-    class HArray2OfBoundedSurface 
-    	instantiates HArray2 from PCollection (BoundedSurface from PGeom);
-    class HArray2OfBezierSurface 
-    	instantiates HArray2 from PCollection (BezierSurface from PGeom);
-    class HArray2OfBSplineSurface 
-    	instantiates HArray2 from PCollection (BSplineSurface from PGeom);
-
-
-
---    class HSequenceOfCurve  
---    	instantiates HSequence from PCollection (Curve from PGeom);
---    class HSequenceOfBoundedCurve  
---    	instantiates HSequence from PCollection (BoundedCurve from PGeom);
---    class HSequenceOfSurface 
---    	instantiates HSequence from PCollection (Surface from PGeom);
---    class HSequenceOfBoundedSurface 
---    	instantiates HSequence from PCollection (BoundedSurface from PGeom);
-
-
-end PColPGeom;
diff --git a/src/PColPGeom2d/PColPGeom2d.cdl b/src/PColPGeom2d/PColPGeom2d.cdl
deleted file mode 100644
index 5018c13de7..0000000000
--- a/src/PColPGeom2d/PColPGeom2d.cdl
+++ /dev/null
@@ -1,46 +0,0 @@
--- Created on: 1993-06-03
--- Created by: fid
--- Copyright (c) 1993-1999 Matra Datavision
--- Copyright (c) 1999-2014 OPEN CASCADE SAS
---
--- This file is part of Open CASCADE Technology software library.
---
--- This library is free software; you can redistribute it and/or modify it under
--- the terms of the GNU Lesser General Public License version 2.1 as published
--- by the Free Software Foundation, with special exception defined in the file
--- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
--- distribution for complete text of the license and disclaimer of any warranty.
---
--- Alternatively, this file may be used under the terms of Open CASCADE
--- commercial license or contractual agreement.
-
-package PColPGeom2d 
-
-        ---Purpose : This package  is used to  instantiate of  several
-        --         generic classes from  the package  PCollection with
-        --         objects from the package PGeom2d.
-
-uses PCollection, PGeom2d
-
-is
-
-
-
-    class HArray1OfCurve 
-    	instantiates HArray1 from PCollection (Curve from PGeom2d);
-    class HArray1OfBoundedCurve 
-    	instantiates HArray1 from PCollection (BoundedCurve from PGeom2d);
-    class HArray1OfBezierCurve 
-    	instantiates HArray1 from PCollection (BezierCurve from PGeom2d);
-    class HArray1OfBSplineCurve 
-    	instantiates HArray1 from PCollection (BSplineCurve from PGeom2d);
-
-
-
---    class HSequenceOfCurve  
---    	instantiates HSequence from PCollection (Curve from PGeom2d);
---    class HSequenceOfBoundedCurve  
---    	instantiates HSequence from PCollection (BoundedCurve from PGeom2d);
-
-
-end PColPGeom2d;
diff --git a/src/ShapeSchema/ShapeSchema.cdl b/src/ShapeSchema/ShapeSchema.cdl
index 03356d29e9..f54c4e00fd 100644
--- a/src/ShapeSchema/ShapeSchema.cdl
+++ b/src/ShapeSchema/ShapeSchema.cdl
@@ -27,8 +27,6 @@ is
     package PColgp;
     package PGeom2d;
     package PGeom;
-    package PColPGeom;
-    package PColPGeom2d;
     package PPoly;
     package PTopoDS;
     package PBRep;
diff --git a/src/TColGeom/TColGeom.cdl b/src/TColGeom/TColGeom.cdl
index fa9d366d47..c975a0e9a3 100644
--- a/src/TColGeom/TColGeom.cdl
+++ b/src/TColGeom/TColGeom.cdl
@@ -28,23 +28,16 @@ is
 
     class Array1OfCurve 
     	instantiates Array1 from TCollection (Curve from Geom);
-    class Array1OfBoundedCurve 
-    	instantiates Array1 from TCollection (BoundedCurve from Geom);
     class Array1OfBezierCurve 
     	instantiates Array1 from TCollection (BezierCurve from Geom);
     class Array1OfBSplineCurve 
     	instantiates Array1 from TCollection (BSplineCurve from Geom);
     class Array1OfSurface 
     	instantiates Array1 from TCollection (Surface from Geom);
-    class Array1OfBoundedSurface 
-    	instantiates Array1 from TCollection (BoundedSurface from Geom);
 
     class HArray1OfCurve
     	instantiates HArray1 from TCollection (Curve from Geom,
     	    	    	    	Array1OfCurve from TColGeom);
-    class HArray1OfBoundedCurve 
-    	instantiates HArray1 from TCollection (BoundedCurve from Geom,
-    	    	    	    	Array1OfBoundedCurve from TColGeom);
     class HArray1OfBezierCurve  
     	instantiates HArray1 from TCollection (BezierCurve from Geom,
     	    	    	    	Array1OfBezierCurve from TColGeom);
@@ -54,33 +47,15 @@ is
     class HArray1OfSurface  
     	instantiates HArray1 from TCollection (Surface from Geom,
     	    	    	    	Array1OfSurface from TColGeom);
-    class HArray1OfBoundedSurface 
-    	instantiates HArray1 from TCollection (BoundedSurface from Geom,
-    	    	    	    	Array1OfBoundedSurface from TColGeom);
-
 
     class Array2OfSurface 
     	instantiates Array2 from TCollection (Surface from Geom);
-    class Array2OfBoundedSurface 
-    	instantiates Array2 from TCollection (BoundedSurface from Geom);
     class Array2OfBezierSurface 
     	instantiates Array2 from TCollection (BezierSurface from Geom);
-    class Array2OfBSplineSurface 
-    	instantiates Array2 from TCollection (BSplineSurface from Geom);
 
     class HArray2OfSurface        
     	instantiates HArray2 from TCollection (Surface from Geom,
     	    	    	    	Array2OfSurface from TColGeom);
-    class HArray2OfBoundedSurface 
-    	instantiates HArray2 from TCollection (BoundedSurface from Geom,
-    	    	    	    	Array2OfBoundedSurface from TColGeom);
-    class HArray2OfBezierSurface  
-    	instantiates HArray2 from TCollection (BezierSurface from Geom,
-    	    	    	    	Array2OfBezierSurface from TColGeom);
-    class HArray2OfBSplineSurface 
-    	instantiates HArray2 from TCollection (BSplineSurface from Geom,
-    	    	    	    	Array2OfBSplineSurface from TColGeom);
-
 
     class SequenceOfCurve  
     	instantiates Sequence from TCollection (Curve from Geom);
@@ -88,8 +63,6 @@ is
     	instantiates Sequence from TCollection (BoundedCurve from Geom);
     class SequenceOfSurface 
     	instantiates Sequence from TCollection (Surface from Geom);
-    class SequenceOfBoundedSurface 
-    	instantiates Sequence from TCollection (BoundedSurface from Geom);
 
     class HSequenceOfCurve  
     	instantiates HSequence from TCollection (Curve from Geom,
@@ -97,12 +70,5 @@ is
     class HSequenceOfBoundedCurve  
     	instantiates HSequence from TCollection (BoundedCurve from Geom,
     	    	    	    	SequenceOfBoundedCurve from TColGeom);
-    class HSequenceOfSurface 
-    	instantiates HSequence from TCollection (Surface from Geom,
-    	    	    	    	SequenceOfSurface from TColGeom);
-    class HSequenceOfBoundedSurface 
-    	instantiates HSequence from TCollection (BoundedSurface from Geom,
-    	    	    	    	SequenceOfBoundedSurface from TColGeom);
-
 
 end TColGeom;
diff --git a/src/TColGeom2d/TColGeom2d.cdl b/src/TColGeom2d/TColGeom2d.cdl
index 515348aff3..e6ff68ab3e 100644
--- a/src/TColGeom2d/TColGeom2d.cdl
+++ b/src/TColGeom2d/TColGeom2d.cdl
@@ -27,26 +27,16 @@ uses TCollection, Geom2d
 is
 
 
-    class Array1OfGeometry 
-    	instantiates Array1 from TCollection (Geometry from Geom2d);
     class Array1OfCurve 
     	instantiates Array1 from TCollection (Curve from Geom2d);
-    class Array1OfBoundedCurve 
-    	instantiates Array1 from TCollection (BoundedCurve from Geom2d);
     class Array1OfBezierCurve 
     	instantiates Array1 from TCollection (BezierCurve from Geom2d);
     class Array1OfBSplineCurve 
     	instantiates Array1 from TCollection (BSplineCurve from Geom2d);
 
-    class HArray1OfGeometry
-    	instantiates HArray1 from TCollection (Geometry from Geom2d,
-    	    	    	    	Array1OfGeometry from TColGeom2d);
     class HArray1OfCurve
     	instantiates HArray1 from TCollection (Curve from Geom2d,
     	    	    	    	Array1OfCurve from TColGeom2d);
-    class HArray1OfBoundedCurve 
-    	instantiates HArray1 from TCollection (BoundedCurve from Geom2d,
-    	    	    	    	Array1OfBoundedCurve from TColGeom2d);
     class HArray1OfBezierCurve  
     	instantiates HArray1 from TCollection (BezierCurve from Geom2d,
     	    	    	    	Array1OfBezierCurve from TColGeom2d);
@@ -54,7 +44,6 @@ is
     	instantiates HArray1 from TCollection (BSplineCurve from Geom2d,
     	    	    	    	Array1OfBSplineCurve from TColGeom2d);
 
-
     class SequenceOfGeometry  
     	instantiates Sequence from TCollection (Geometry from Geom2d);
     class SequenceOfCurve  
@@ -62,9 +51,6 @@ is
     class SequenceOfBoundedCurve  
     	instantiates Sequence from TCollection (BoundedCurve from Geom2d);
 
-    class HSequenceOfGeometry  
-    	instantiates HSequence from TCollection (Geometry from Geom2d,
-    	    	    	    	SequenceOfGeometry from TColGeom2d);
     class HSequenceOfCurve  
     	instantiates HSequence from TCollection (Curve from Geom2d,
     	    	    	    	SequenceOfCurve from TColGeom2d);
diff --git a/src/TKPShape/PACKAGES b/src/TKPShape/PACKAGES
index 888c900e04..be57f2419d 100755
--- a/src/TKPShape/PACKAGES
+++ b/src/TKPShape/PACKAGES
@@ -5,8 +5,6 @@ PGeom2d
 PPoly
 PColgp
 PTopLoc
-PColPGeom
-PColPGeom2d
 MgtBRep
 MgtGeom
 MgtGeom2d
diff --git a/tests/de/iges_1/B4 b/tests/de/iges_1/B4
index 9b53028486..58004497cb 100644
--- a/tests/de/iges_1/B4
+++ b/tests/de/iges_1/B4
@@ -1,5 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
+puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: Exception in Segment()"
 
 set LinuxDiff 1
 set filename t500core.igs
diff --git a/tests/de/iges_1/L5 b/tests/de/iges_1/L5
index 904a7085df..142b27ee2d 100644
--- a/tests/de/iges_1/L5
+++ b/tests/de/iges_1/L5
@@ -3,6 +3,7 @@ puts "TODO CR23096 ALL: TOLERANCE : Faulty"
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
+
 set filename PRO10578.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/P9 b/tests/de/iges_1/P9
index 51a70d1620..33c359623d 100644
--- a/tests/de/iges_1/P9
+++ b/tests/de/iges_1/P9
@@ -1,5 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
+puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: Exception in Segment()"
+
+
 puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
diff --git a/tests/de/iges_2/B1 b/tests/de/iges_2/B1
index 5095c18c4f..a5be016ae5 100755
--- a/tests/de/iges_2/B1
+++ b/tests/de/iges_2/B1
@@ -5,6 +5,7 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
 
+
 set filename CATIA01.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/H9 b/tests/de/iges_2/H9
index c12c6d081b..2196b30f5f 100644
--- a/tests/de/iges_2/H9
+++ b/tests/de/iges_2/H9
@@ -3,9 +3,11 @@ puts "TODO CR23096 ALL: CHECKSHAPE : Faulty"
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
+
+
 puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty " 
+
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: ShapeAnalysis_Surface"
 
 set LinuxDiff 4
 set LinuxFaulties {STATSHAPE}
diff --git a/tests/de/step_1/D1 b/tests/de/step_1/D1
index 6d80633068..422025bc8e 100644
--- a/tests/de/step_1/D1
+++ b/tests/de/step_1/D1
@@ -1,7 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: ShapeFix_ComposeShell"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: color name"
+
 
 
 set filename trj9_b2-ai-214.stp
diff --git a/tests/de/step_1/E6 b/tests/de/step_1/E6
index 93c9a8f008..d1fc1695ee 100644
--- a/tests/de/step_1/E6
+++ b/tests/de/step_1/E6
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename trj4_s1-ai-214.stp
diff --git a/tests/de/step_1/F9 b/tests/de/step_1/F9
index 092516c72a..a7b3930dab 100644
--- a/tests/de/step_1/F9
+++ b/tests/de/step_1/F9
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : 1 differences with reference data found"
+
 
 
 set filename trj6_pm4-al-214.stp
diff --git a/tests/de/step_1/G2 b/tests/de/step_1/G2
index d351770d50..85e585b4d4 100644
--- a/tests/de/step_1/G2
+++ b/tests/de/step_1/G2
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename db_as1-A.stp
diff --git a/tests/de/step_1/G3 b/tests/de/step_1/G3
index c104f7d558..1a136e2525 100644
--- a/tests/de/step_1/G3
+++ b/tests/de/step_1/G3
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename db_as1-B.stp
diff --git a/tests/de/step_1/G5 b/tests/de/step_1/G5
index 2da700ec11..cacf402f38 100644
--- a/tests/de/step_1/G5
+++ b/tests/de/step_1/G5
@@ -2,7 +2,7 @@
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename trj3_s1-db-214.stp
diff --git a/tests/de/step_1/G6 b/tests/de/step_1/G6
index 55dd30458c..ce3d19758b 100644
--- a/tests/de/step_1/G6
+++ b/tests/de/step_1/G6
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename tr8_as2_db.stp
diff --git a/tests/de/step_1/G7 b/tests/de/step_1/G7
index c833aa56a8..75e4c972f6 100644
--- a/tests/de/step_1/G7
+++ b/tests/de/step_1/G7
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename tr8_as2a_db.stp
diff --git a/tests/de/step_1/ZF7 b/tests/de/step_1/ZF7
index 8357e1220c..d3ea007853 100644
--- a/tests/de/step_1/ZF7
+++ b/tests/de/step_1/ZF7
@@ -1,11 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64: \\*\\* Exception \\*\\*.*"
-puts "TODO DEBUG_OCC24121 Debian60-64: An exception was caught"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: First - file was not written - exception"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : Here is writing problem"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : 3 differences with reference data found"
 
 
 set filename S4132-test.stp
diff --git a/tests/de/step_1/ZG2 b/tests/de/step_1/ZG2
index 780c143b78..55b2ac04b4 100644
--- a/tests/de/step_1/ZG2
+++ b/tests/de/step_1/ZG2
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename as1ug.stp
diff --git a/tests/de/step_1/ZH7 b/tests/de/step_1/ZH7
index dfdfa7e8a0..bd6157aa62 100644
--- a/tests/de/step_1/ZH7
+++ b/tests/de/step_1/ZH7
@@ -2,7 +2,7 @@
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 
 set filename tr8_ha1_db.stp
diff --git a/tests/de/step_2/A5 b/tests/de/step_2/A5
index 7d4abf3d53..9dc11fab9a 100644
--- a/tests/de/step_2/A5
+++ b/tests/de/step_2/A5
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 set filename r86ug.stp
 
diff --git a/tests/de/step_2/D9 b/tests/de/step_2/D9
index 08947874ee..6c2abc421b 100644
--- a/tests/de/step_2/D9
+++ b/tests/de/step_2/D9
@@ -2,7 +2,7 @@
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 set filename bm4_db_punch_a.stp
 
diff --git a/tests/de/step_2/E1 b/tests/de/step_2/E1
index 785314652c..b5ee6201e4 100644
--- a/tests/de/step_2/E1
+++ b/tests/de/step_2/E1
@@ -2,7 +2,7 @@
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: StepToTopoDS_TranslateCompositeCurve"
+
 
 
 set filename tr9_r0901-al.stp
diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7
index f356c266c3..4497815c8d 100644
--- a/tests/de/step_2/E7
+++ b/tests/de/step_2/E7
@@ -2,8 +2,9 @@
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
+
+
 puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: StepToGeom_MakeSurface"
 
 set LinuxDiff 3
 set filename r76sy.stp
diff --git a/tests/de/step_2/E9 b/tests/de/step_2/E9
index 3bfeefb0de..a217555ee3 100644
--- a/tests/de/step_2/E9
+++ b/tests/de/step_2/E9
@@ -2,7 +2,7 @@
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 set filename bm4_db_punch_c.stp
 
diff --git a/tests/de/step_2/F2 b/tests/de/step_2/F2
index d30b077236..1b8300166a 100644
--- a/tests/de/step_2/F2
+++ b/tests/de/step_2/F2
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 set filename bm4_db_conn_a.stp
 
diff --git a/tests/de/step_2/F3 b/tests/de/step_2/F3
index 80d26fe3c0..001512e276 100644
--- a/tests/de/step_2/F3
+++ b/tests/de/step_2/F3
@@ -2,7 +2,7 @@
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
+
 
 set filename bm4_db_conn_d.stp
 
diff --git a/tests/de/step_3/E6 b/tests/de/step_3/E6
index 4b336f3d12..96a28258e8 100644
--- a/tests/de/step_3/E6
+++ b/tests/de/step_3/E6
@@ -5,8 +5,6 @@ puts "TODO CR23096 ALL: TOLERANCE : Faulty"
 
 puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
-puts "TODO DEBUG_CR24543 ALL: Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires"
-
 set LinuxDiff 3
 set filename Z8M6SAT.stp