diff --git a/src/AIS/AIS_AngleDimension.cxx b/src/AIS/AIS_AngleDimension.cxx
index c7a2be3e06..4bb905d332 100644
--- a/src/AIS/AIS_AngleDimension.cxx
+++ b/src/AIS/AIS_AngleDimension.cxx
@@ -594,7 +594,6 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*
                                   const Handle(Prs3d_Presentation)& thePresentation,
                                   const Standard_Integer theMode)
 {
-  thePresentation->Clear();
   mySelectionGeom.Clear (theMode);
 
   if (!IsValid())
diff --git a/src/AIS/AIS_Axis.cxx b/src/AIS/AIS_Axis.cxx
index ee9601d29f..d04e55eb87 100644
--- a/src/AIS/AIS_Axis.cxx
+++ b/src/AIS/AIS_Axis.cxx
@@ -169,9 +169,6 @@ void AIS_Axis::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 		       const Handle(Prs3d_Presentation)& aPresentation, 
 		       const Standard_Integer)
 {
-  aPresentation->Clear();
-
-  //Pro.... : pas de prise en compte des axes lors du FITALL (jmi)
   aPresentation->SetInfiniteState (myInfiniteState);
 
   aPresentation->SetDisplayPriority(5);
diff --git a/src/AIS/AIS_Chamf2dDimension.cxx b/src/AIS/AIS_Chamf2dDimension.cxx
index 1be69f41bd..1cad4d968b 100644
--- a/src/AIS/AIS_Chamf2dDimension.cxx
+++ b/src/AIS/AIS_Chamf2dDimension.cxx
@@ -104,8 +104,6 @@ void AIS_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
 				   const Handle(Prs3d_Presentation)& aPresentation, 
 				   const Standard_Integer)
 {
-    aPresentation->Clear();
-
     Handle(Geom_Curve) gcurv;
     gp_Pnt pfirst,plast;
     const TopoDS_Edge& thechamfedge = TopoDS::Edge(myFShape);
diff --git a/src/AIS/AIS_Chamf3dDimension.cxx b/src/AIS/AIS_Chamf3dDimension.cxx
index 50d3a615f8..9cf07d2ca9 100644
--- a/src/AIS/AIS_Chamf3dDimension.cxx
+++ b/src/AIS/AIS_Chamf3dDimension.cxx
@@ -99,8 +99,6 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
 				   const Handle(Prs3d_Presentation)& aPresentation, 
 				   const Standard_Integer)
 {
-  aPresentation->Clear();
-
   //----------------------------
   // Calcul du centre de la face
   //----------------------------
diff --git a/src/AIS/AIS_Circle.cxx b/src/AIS/AIS_Circle.cxx
index b33789431b..82254ca47d 100644
--- a/src/AIS/AIS_Circle.cxx
+++ b/src/AIS/AIS_Circle.cxx
@@ -78,8 +78,6 @@ void AIS_Circle::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresenta
                          const Handle(Prs3d_Presentation)& aPresentation, 
                          const Standard_Integer /*aMode*/)
 {
-  aPresentation->Clear();
-
   aPresentation->SetDisplayPriority(5);
 
   if (myCircleIsArc) ComputeArc(aPresentation);
diff --git a/src/AIS/AIS_ColoredShape.cxx b/src/AIS/AIS_ColoredShape.cxx
index e8f20ddeda..d092581797 100644
--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -299,7 +299,11 @@ void AIS_ColoredShape::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
                                 const Handle(Prs3d_Presentation)&           thePrs,
                                 const Standard_Integer                      theMode)
 {
-  thePrs->Clear();
+  if (myshape.IsNull())
+  {
+    return;
+  }
+
   if (IsInfinite())
   {
     thePrs->SetInfiniteState (Standard_True);
diff --git a/src/AIS/AIS_ConcentricRelation.cxx b/src/AIS/AIS_ConcentricRelation.cxx
index aa11bcebbd..51445a906c 100644
--- a/src/AIS/AIS_ConcentricRelation.cxx
+++ b/src/AIS/AIS_ConcentricRelation.cxx
@@ -66,8 +66,6 @@ void AIS_ConcentricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&
 				     const Handle(Prs3d_Presentation)& aPresentation, 
 				     const Standard_Integer)
 {
-  aPresentation->Clear();
-
   TopAbs_ShapeEnum type2(mySShape.ShapeType());
   aPresentation->SetInfiniteState(Standard_True);
   switch (myFShape.ShapeType()) {
diff --git a/src/AIS/AIS_DiameterDimension.cxx b/src/AIS/AIS_DiameterDimension.cxx
index 0d679da64e..d9da0eac9c 100644
--- a/src/AIS/AIS_DiameterDimension.cxx
+++ b/src/AIS/AIS_DiameterDimension.cxx
@@ -282,7 +282,6 @@ void AIS_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager3d)&
                                      const Handle(Prs3d_Presentation)& thePresentation, 
                                      const Standard_Integer theMode)
 {
-  thePresentation->Clear();
   mySelectionGeom.Clear (theMode);
 
   if (!IsValid())
diff --git a/src/AIS/AIS_EqualDistanceRelation.cxx b/src/AIS/AIS_EqualDistanceRelation.cxx
index f999dc37b2..6cd5b5de9d 100644
--- a/src/AIS/AIS_EqualDistanceRelation.cxx
+++ b/src/AIS/AIS_EqualDistanceRelation.cxx
@@ -81,9 +81,6 @@ void AIS_EqualDistanceRelation::Compute( const Handle( PrsMgr_PresentationManage
 					 const Handle( Prs3d_Presentation )& aPresentation,
 					 const Standard_Integer ) 
 {
-
-  aPresentation->Clear();
-
   gp_Pnt Position12 =  myPosition, Position34 = myPosition;
 
   Handle(Prs3d_DimensionAspect) la = myDrawer->DimensionAspect();
diff --git a/src/AIS/AIS_EqualRadiusRelation.cxx b/src/AIS/AIS_EqualRadiusRelation.cxx
index e055dad667..4f903e8f77 100644
--- a/src/AIS/AIS_EqualRadiusRelation.cxx
+++ b/src/AIS/AIS_EqualRadiusRelation.cxx
@@ -65,8 +65,6 @@ void AIS_EqualRadiusRelation::Compute( const Handle( PrsMgr_PresentationManager3
 				       const Handle( Prs3d_Presentation )& aPresentation,
 				       const Standard_Integer ) 
 {
-  aPresentation->Clear();
-
   BRepAdaptor_Curve FirstCurve( TopoDS::Edge( myFShape ) ), SecondCurve( TopoDS::Edge( mySShape ) );
 
   Standard_Real FirstPar1 = FirstCurve.FirstParameter(), LastPar1 = FirstCurve.LastParameter(),
diff --git a/src/AIS/AIS_FixRelation.cxx b/src/AIS/AIS_FixRelation.cxx
index 4497926a63..15737d9f42 100644
--- a/src/AIS/AIS_FixRelation.cxx
+++ b/src/AIS/AIS_FixRelation.cxx
@@ -171,8 +171,6 @@ void AIS_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 			      const Handle(Prs3d_Presentation)& aPresentation, 
 			      const Standard_Integer)
 {
-  aPresentation->Clear();
-
   // Calculate position of the symbol and
   // point of attach of the segment on the shape
   gp_Pnt curpos;
diff --git a/src/AIS/AIS_IdenticRelation.cxx b/src/AIS/AIS_IdenticRelation.cxx
index ad243462a4..203a8008ab 100644
--- a/src/AIS/AIS_IdenticRelation.cxx
+++ b/src/AIS/AIS_IdenticRelation.cxx
@@ -309,8 +309,6 @@ void AIS_IdenticRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				  const Handle(Prs3d_Presentation)& aprs, 
 				  const Standard_Integer)
 {
-  aprs->Clear();
-
   switch ( myFShape.ShapeType() ) {
     
   case TopAbs_VERTEX:
diff --git a/src/AIS/AIS_LengthDimension.cxx b/src/AIS/AIS_LengthDimension.cxx
index ad63207696..7249c67ec7 100755
--- a/src/AIS/AIS_LengthDimension.cxx
+++ b/src/AIS/AIS_LengthDimension.cxx
@@ -272,7 +272,6 @@ void AIS_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /
                                    const Handle(Prs3d_Presentation)& thePresentation,
                                    const Standard_Integer theMode)
 {
-  thePresentation->Clear();
   mySelectionGeom.Clear (theMode);
 
   if (!IsValid())
diff --git a/src/AIS/AIS_Line.cxx b/src/AIS/AIS_Line.cxx
index 93422d02db..b9229cf3ef 100644
--- a/src/AIS/AIS_Line.cxx
+++ b/src/AIS/AIS_Line.cxx
@@ -117,8 +117,6 @@ void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 		       const Handle(Prs3d_Presentation)& aPresentation, 
 		       const Standard_Integer)
 {
-  aPresentation->Clear();
-
   aPresentation->SetDisplayPriority(5);
 
   if (!myLineIsSegment) ComputeInfiniteLine(aPresentation);
diff --git a/src/AIS/AIS_MaxRadiusDimension.cxx b/src/AIS/AIS_MaxRadiusDimension.cxx
index 44eeb6d532..9486fcad2e 100644
--- a/src/AIS/AIS_MaxRadiusDimension.cxx
+++ b/src/AIS/AIS_MaxRadiusDimension.cxx
@@ -104,8 +104,6 @@ void AIS_MaxRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&
 				     const Handle(Prs3d_Presentation)& aPresentation, 
 				     const Standard_Integer /*aMode*/)
 {
-  aPresentation->Clear();
-
 //  if( myAutomaticPosition )
     {//ota : recompute in any case 
       ComputeGeometry();
diff --git a/src/AIS/AIS_MidPointRelation.cxx b/src/AIS/AIS_MidPointRelation.cxx
index c64c5ad68c..910b9600ea 100644
--- a/src/AIS/AIS_MidPointRelation.cxx
+++ b/src/AIS/AIS_MidPointRelation.cxx
@@ -80,8 +80,6 @@ void AIS_MidPointRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				   const Handle(Prs3d_Presentation)& aprs, 
 				   const Standard_Integer)
 {
-  aprs->Clear();
-  
   if (myTool.ShapeType() == TopAbs_VERTEX)
     {
       gp_Pnt pp;
diff --git a/src/AIS/AIS_MinRadiusDimension.cxx b/src/AIS/AIS_MinRadiusDimension.cxx
index 3263f01da0..6c988411b0 100644
--- a/src/AIS/AIS_MinRadiusDimension.cxx
+++ b/src/AIS/AIS_MinRadiusDimension.cxx
@@ -104,8 +104,6 @@ void AIS_MinRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&
 				     const Handle(Prs3d_Presentation)& aPresentation, 
 				     const Standard_Integer /*aMode*/)
 {
-  aPresentation->Clear();
-
 //  if( myAutomaticPosition )
     //{ //ota : recompute ellipse always
   ComputeGeometry();
diff --git a/src/AIS/AIS_OffsetDimension.cxx b/src/AIS/AIS_OffsetDimension.cxx
index f41cbaa86b..a4232ad35e 100644
--- a/src/AIS/AIS_OffsetDimension.cxx
+++ b/src/AIS/AIS_OffsetDimension.cxx
@@ -90,10 +90,6 @@ void AIS_OffsetDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				  const Handle(Prs3d_Presentation)& aprs,
 				  const Standard_Integer)
 {
-  aprs->Clear();
-
-  //cout << endl << "This is strange Offset Dimension!" << endl;
-
   gp_Trsf aInvertTrsf = myRelativePos;
   //myArrowSize = fabs (myVal/5.);
   myArrowSize = fabs (myVal/10.0);
diff --git a/src/AIS/AIS_ParallelRelation.cxx b/src/AIS/AIS_ParallelRelation.cxx
index 7ad88331f4..77a3220921 100644
--- a/src/AIS/AIS_ParallelRelation.cxx
+++ b/src/AIS/AIS_ParallelRelation.cxx
@@ -98,8 +98,6 @@ void AIS_ParallelRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				   const Handle(Prs3d_Presentation)& aPresentation, 
 				   const Standard_Integer)
 {
-  aPresentation->Clear();
-
   switch (myFShape.ShapeType())
     {
     case TopAbs_FACE :
diff --git a/src/AIS/AIS_PerpendicularRelation.cxx b/src/AIS/AIS_PerpendicularRelation.cxx
index 8d9f90e48c..4971b147a1 100644
--- a/src/AIS/AIS_PerpendicularRelation.cxx
+++ b/src/AIS/AIS_PerpendicularRelation.cxx
@@ -86,8 +86,6 @@ void AIS_PerpendicularRelation::Compute(const Handle(PrsMgr_PresentationManager3
 					const Handle(Prs3d_Presentation)& aPresentation, 
 					const Standard_Integer)
 {
-  aPresentation->Clear();
-
   if (myFShape.ShapeType() == mySShape.ShapeType()) {
     switch (myFShape.ShapeType()) {
     case TopAbs_FACE :
diff --git a/src/AIS/AIS_Plane.cxx b/src/AIS/AIS_Plane.cxx
index 087cf1e28d..86088627b8 100644
--- a/src/AIS/AIS_Plane.cxx
+++ b/src/AIS/AIS_Plane.cxx
@@ -238,8 +238,6 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
 			const Handle(Prs3d_Presentation)& aPresentation, 
 			const Standard_Integer aMode)
 {
-  aPresentation->Clear();
-
   ComputeFields();
   aPresentation->SetInfiniteState(myInfiniteState);
   myDrawer->PlaneAspect()->EdgesAspect()->SetWidth(myCurrentMode == 0? 1 : 3);
diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx
index 9f6ae8ea2f..728520d7e2 100644
--- a/src/AIS/AIS_PlaneTrihedron.cxx
+++ b/src/AIS/AIS_PlaneTrihedron.cxx
@@ -157,7 +157,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				    const Handle(Prs3d_Presentation)& aPresentation, 
 				    const Standard_Integer)
 {
-  aPresentation->Clear();
   aPresentation->SetDisplayPriority(5);
   // drawing axis in X direction
   gp_Pnt first, last;
diff --git a/src/AIS/AIS_Point.cxx b/src/AIS/AIS_Point.cxx
index 7d752ee8a4..916be5d52c 100644
--- a/src/AIS/AIS_Point.cxx
+++ b/src/AIS/AIS_Point.cxx
@@ -79,8 +79,6 @@ void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
                         const Handle(Prs3d_Presentation)& aPresentation, 
                         const Standard_Integer aMode)
 {
-  aPresentation->Clear();
-
   aPresentation->SetInfiniteState(myInfiniteState);
 
   if (aMode==0)
diff --git a/src/AIS/AIS_PointCloud.cxx b/src/AIS/AIS_PointCloud.cxx
index a9f89022ae..67038d8fb8 100644
--- a/src/AIS/AIS_PointCloud.cxx
+++ b/src/AIS/AIS_PointCloud.cxx
@@ -409,7 +409,6 @@ void AIS_PointCloud::Compute (const Handle(PrsMgr_PresentationManager3d)& /*theP
                               const Handle(Prs3d_Presentation)&           thePrs,
                               const Standard_Integer                      theMode)
 {
-  thePrs->Clear();
   switch (theMode)
   {
     case AIS_PointCloud::DM_Points:
diff --git a/src/AIS/AIS_RadiusDimension.cxx b/src/AIS/AIS_RadiusDimension.cxx
index b1114e9181..e4fd73d532 100644
--- a/src/AIS/AIS_RadiusDimension.cxx
+++ b/src/AIS/AIS_RadiusDimension.cxx
@@ -222,7 +222,6 @@ void AIS_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /
                                    const Handle(Prs3d_Presentation)& thePresentation,
                                    const Standard_Integer theMode)
 {
-  thePresentation->Clear();
   mySelectionGeom.Clear (theMode);
 
   if (!IsValid())
diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx
index d0fc5d3fed..602472874c 100644
--- a/src/AIS/AIS_Shape.cxx
+++ b/src/AIS/AIS_Shape.cxx
@@ -123,7 +123,6 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
                         const Handle(Prs3d_Presentation)& aPrs,
                         const Standard_Integer theMode)
 {  
-  aPrs->Clear();
   if(myshape.IsNull()) return;
 
   // wire,edge,vertex -> pas de HLR + priorite display superieure
diff --git a/src/AIS/AIS_SymmetricRelation.cxx b/src/AIS/AIS_SymmetricRelation.cxx
index 8865a9dac7..003b1d668c 100644
--- a/src/AIS/AIS_SymmetricRelation.cxx
+++ b/src/AIS/AIS_SymmetricRelation.cxx
@@ -77,8 +77,6 @@ void AIS_SymmetricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				    const Handle(Prs3d_Presentation)& aprs, 
 				    const Standard_Integer)
 {
-  aprs->Clear();
-
   switch (myFShape.ShapeType()) {
   case TopAbs_FACE :
     {
diff --git a/src/AIS/AIS_TangentRelation.cxx b/src/AIS/AIS_TangentRelation.cxx
index 9660554006..d7bda0862c 100644
--- a/src/AIS/AIS_TangentRelation.cxx
+++ b/src/AIS/AIS_TangentRelation.cxx
@@ -96,8 +96,6 @@ void AIS_TangentRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 				  const Handle(Prs3d_Presentation)& aPresentation, 
 				  const Standard_Integer)
 {
-  aPresentation->Clear();
- 
   switch (myFShape.ShapeType())
     {
     case TopAbs_FACE :
diff --git a/src/AIS/AIS_TexturedShape.cxx b/src/AIS/AIS_TexturedShape.cxx
index aa537220fe..4b7ba3b449 100644
--- a/src/AIS/AIS_TexturedShape.cxx
+++ b/src/AIS/AIS_TexturedShape.cxx
@@ -397,8 +397,6 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t
                                  const Handle(Prs3d_Presentation)&           thePrs,
                                  const Standard_Integer                      theMode)
 {
-  thePrs->Clear();
-
   if (myshape.IsNull())
   {
     return;
diff --git a/src/AIS/AIS_Trihedron.cxx b/src/AIS/AIS_Trihedron.cxx
index 27d55068ee..2bdee5f579 100644
--- a/src/AIS/AIS_Trihedron.cxx
+++ b/src/AIS/AIS_Trihedron.cxx
@@ -276,8 +276,6 @@ void AIS_Trihedron::Compute(
  const Handle(Prs3d_Presentation)& aPresentation, 
  const Standard_Integer aMode)
 {
-  aPresentation->Clear();
-
   aPresentation->SetInfiniteState (Standard_True);
   switch(aMode){
   case 0: