diff --git a/Modules/MitkExt/Algorithms/vtkImageStencilRaster.h b/Modules/MitkExt/Algorithms/vtkImageStencilRaster.h
deleted file mode 100644
index 1815d054fa..0000000000
--- a/Modules/MitkExt/Algorithms/vtkImageStencilRaster.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*=========================================================================
-
-  Program:   Visualization Toolkit
-  Module:    vtkImageStencilData.h
-
-  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-  All rights reserved.
-  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notice for more information.
-
-=========================================================================*/
-// .NAME vtkImageStencilData - efficient description of an image stencil
-// .SECTION Description
-// vtkImageStencilData describes an image stencil in a manner which is
-// efficient both in terms of speed and storage space.  The stencil extents
-// are stored for each x-row across the image (multiple extents per row if
-// necessary) and can be retrieved via the GetNextExtent() method.
-// .SECTION see also
-// vtkImageStencilSource vtkImageStencil
-
-#ifndef __vtkImageStencilRaster_h
-#define __vtkImageStencilRaster_h
-
-#include "vtkImageStencilData.h"
-#include "vtkDataObject.h"
-#include "MitkExtExports.h"
-
-
-//BTX
-// Description:
-// This is a helper class for stencil creation.  It is a raster with
-// infinite resolution in the X direction (approximately, since it uses
-// double precision).  Lines that represent polygon edges can be drawn
-// into this raster, and then filled given a tolerance.
-class MitkExt_EXPORT vtkImageStencilRaster
-{
-public:
-  // Description:
-  // Create a raster with the specified whole y extent.
-  vtkImageStencilRaster(const int wholeExtent[2]);
-
-  // Description:
-  // Destructor.
-  ~vtkImageStencilRaster();
-
-  // Description:
-  // Reset the raster to its original state, but keep the same whole
-  // extent. Pre-allocate the specified 1D allocateExtent, which must be
-  // within the whole extent.
-  void PrepareForNewData(const int allocateExtent[2] = 0);
-
-  // Description:
-  // Insert a line into the raster, given the two end points.
-  // The "inflect1" and "inflect2" should be set if you want
-  // to add a small vertical tolerance to either endpoints.
-  void InsertLine(const double p1[2], const double p2[2],
-                  bool inflect1, bool inflect2);
-
-  // Description:
-  // Fill the specified extent of a vtkImageStencilData with the raster,
-  // after permuting the raster according to xj and yj.
-  void FillStencilData(vtkImageStencilData *data, const int extent[6],
-                       int xj = 0, int yj = 1);
-
-  // Description:
-  // The tolerance for float-to-int conversions.
-  void SetTolerance(double tol) { this->Tolerance = tol; }
-  double GetTolerance() { return this->Tolerance; }
-
-protected:
-  // Description:
-  // Ensure that the raster is initialized for the specified range
-  // of y values, which must be within the Extent.
-  void PrepareExtent(int ymin, int ymax);
-
-  // Description:
-  // Insert an x point into the raster.  If the y value is larger
-  // than the y extent, the extent will grow automatically.
-  void InsertPoint(int y, double x);
-
-  int Extent[2];
-  int UsedExtent[2];
-  double **Raster;
-  double Tolerance;
-
-private:
-  vtkImageStencilRaster(const vtkImageStencilRaster&);  // Not implemented.
-  void operator=(const vtkImageStencilRaster&);  // Not implemented.
-};
-//ETX
-
-#endif
-
-
-
diff --git a/Modules/MitkExt/Algorithms/vtkLassoStencilSource.h b/Modules/MitkExt/Algorithms/vtkLassoStencilSource.h
deleted file mode 100644
index 86ada7a3b7..0000000000
--- a/Modules/MitkExt/Algorithms/vtkLassoStencilSource.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*=========================================================================
-
-  Program:   Visualization Toolkit
-  Module:    vtkLassoStencilSource.h
-
-  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-  All rights reserved.
-  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notice for more information.
-
-=========================================================================*/
-// .NAME vtkLassoStencilSource - Create a stencil from a contour
-// .SECTION Description
-// vtkLassoStencilSource will create an image stencil from a
-// set of points that define a contour.  Its output can be
-// used with vtkImageStecil or other vtk classes that apply
-// a stencil to an image.
-// .SECTION See Also
-// vtkROIStencilSource vtkPolyDataToImageStencil
-// .SECTION Thanks
-// Thanks to David Gobbi for contributing this class to VTK.
-
-#ifndef __vtkLassoStencilSource_h
-#define __vtkLassoStencilSource_h
-
-
-#include "vtkImageStencilSource.h"
-#include "MitkExtExports.h"
-
-class vtkPoints;
-class vtkSpline;
-class vtkLSSPointMap;
-
-class MitkExt_EXPORT vtkLassoStencilSource : public vtkImageStencilSource
-{
-public:
-  static vtkLassoStencilSource *New();
-  vtkTypeMacro(vtkLassoStencilSource, vtkImageStencilSource);
-  void PrintSelf(ostream& os, vtkIndent indent);
-
-//BTX
-  enum {
-    POLYGON = 0,
-    SPLINE = 1,
-  };
-//ETX
-
-  // Description:
-  // The shape to use, default is "Polygon".  The spline is a
-  // cardinal spline.  Bezier splines are not yet supported.
-  vtkGetMacro(Shape, int);
-  vtkSetClampMacro(Shape, int, POLYGON, SPLINE);
-  void SetShapeToPolygon() { this->SetShape(POLYGON); };
-  void SetShapeToSpline() { this->SetShape(SPLINE); };
-  virtual const char *GetShapeAsString();
-
-  // Description:
-  // The points that make up the lassoo.  The loop does not
-  // have to be closed, the last point will automatically be
-  // connected to the first point by a straight line segment.
-  virtual void SetPoints(vtkPoints *points);
-  vtkGetObjectMacro(Points, vtkPoints);
-
-  // Description:
-  // The slice orientation.  The default is 2, which is XY.
-  // Other values are 0, which is YZ, and 1, which is XZ.
-  vtkGetMacro(SliceOrientation, int);
-  vtkSetClampMacro(SliceOrientation, int, 0, 2);
-
-  // Description:
-  // The points for a particular slice.  This will override the
-  // points that were set by calling SetPoints() for the slice.
-  // To clear the setting, call SetSlicePoints(slice, NULL).
-  virtual void SetSlicePoints(int i, vtkPoints *points);
-  virtual vtkPoints *GetSlicePoints(int i);
-
-  // Description:
-  // Remove points from all slices.
-  virtual void RemoveAllSlicePoints();
-
-  // Description:
-  // Overload GetMTime() to include the timestamp on the points.
-  unsigned long GetMTime();
-
-protected:
-  vtkLassoStencilSource();
-  ~vtkLassoStencilSource();
-
-  virtual int RequestData(vtkInformation *, vtkInformationVector **,
-                          vtkInformationVector *);
-
-  int Shape;
-  int SliceOrientation;
-  vtkPoints *Points;
-  vtkSpline *SplineX;
-  vtkSpline *SplineY;
-  vtkLSSPointMap *PointMap;
-
-private:
-  vtkLassoStencilSource(const vtkLassoStencilSource&);  // Not implemented.
-  void operator=(const vtkLassoStencilSource&);  // Not implemented.
-};
-
-#endif
diff --git a/Modules/MitkExt/files.cmake b/Modules/MitkExt/files.cmake
index ce52690e16..f0f21d93a3 100644
--- a/Modules/MitkExt/files.cmake
+++ b/Modules/MitkExt/files.cmake
@@ -1,208 +1,206 @@
 SET(CPP_FILES
   Algorithms/mitkMaskAndCutRoiImageFilter.cpp
   Algorithms/mitkBoundingObjectToSegmentationFilter.cpp
   Algorithms/vtkPointSetSlicer.cxx
   Algorithms/mitkCoreExtObjectFactory.cpp
   Algorithms/mitkImageStatisticsCalculator.cpp
   Algorithms/mitkAngleCorrectByPointFilter.cpp
   Algorithms/mitkAutoCropImageFilter.cpp
   Algorithms/mitkBoundingObjectCutter.cpp
   Algorithms/mitkCalculateSegmentationVolume.cpp
   Algorithms/mitkContourSetToPointSetFilter.cpp
   Algorithms/mitkContourUtils.cpp
   Algorithms/mitkCorrectorAlgorithm.cpp
   Algorithms/mitkCylindricToCartesianFilter.cpp
   Algorithms/mitkDiffImageApplier.cpp
   Algorithms/mitkDopplerToStrainRateFilter.cpp
   Algorithms/mitkExtractDirectedPlaneImageFilter.cpp
   Algorithms/mitkExtractDirectedPlaneImageFilterNew.cpp
   Algorithms/mitkExtractImageFilter.cpp
   Algorithms/mitkGeometryClipImageFilter.cpp
   Algorithms/mitkGeometryDataSource.cpp
   Algorithms/mitkHeightFieldSurfaceClipImageFilter.cpp
   Algorithms/mitkImageToLookupTableFilter.cpp
   Algorithms/mitkImageToSurfaceFilter.cpp
   Algorithms/mitkInterpolateLinesFilter.cpp
   Algorithms/mitkLabeledImageToSurfaceFilter.cpp
   Algorithms/mitkLabeledImageVolumeCalculator.cpp
   Algorithms/mitkLookupTableSource.cpp
   Algorithms/mitkManualSegmentationToSurfaceFilter.cpp
   Algorithms/mitkMaskImageFilter.cpp
   Algorithms/mitkMeshSource.cpp
   Algorithms/mitkNonBlockingAlgorithm.cpp
   Algorithms/mitkOverwriteSliceImageFilter.cpp
   Algorithms/mitkOverwriteDirectedPlaneImageFilter.cpp
   Algorithms/mitkPadImageFilter.cpp
   Algorithms/mitkPlaneCutFilter.cpp
   Algorithms/mitkPlaneFit.cpp
   Algorithms/mitkPlanesPerpendicularToLinesFilter.cpp
   Algorithms/mitkPointLocator.cpp
   Algorithms/mitkPointSetToCurvedGeometryFilter.cpp
   Algorithms/mitkPointSetToGeometryDataFilter.cpp
   Algorithms/mitkPointSetIndexToWorldTransformFilter.cpp
   Algorithms/mitkSurfaceIndexToWorldTransformFilter.cpp
   Algorithms/mitkPolygonToRingFilter.cpp
   Algorithms/mitkProbeFilter.cpp
   Algorithms/mitkSegmentationSink.cpp
   Algorithms/mitkShapeBasedInterpolationAlgorithm.cpp
   Algorithms/mitkShowSegmentationAsSurface.cpp
   Algorithms/mitkSimpleHistogram.cpp
   Algorithms/mitkSimpleUnstructuredGridHistogram.cpp
   Algorithms/mitkSurfaceToImageFilter.cpp
   Algorithms/mitkUnstructuredGridHistogram.cpp
   Algorithms/mitkUnstructuredGridSource.cpp
-  Algorithms/vtkImageStencilRaster.cxx
-  Algorithms/vtkLassoStencilSource.cxx
   Algorithms/mitkVolumeVisualizationImagePreprocessor.cpp
   Controllers/mitkMovieGenerator.cpp
   Controllers/mitkMultiStepper.cpp
   Controllers/mitkSegmentationInterpolationController.cpp
   Controllers/mitkToolManager.cpp
   DataManagement/mitkAffineTransformationOperation.cpp
   DataManagement/mitkApplyDiffImageOperation.cpp
   DataManagement/mitkBoundingObject.cpp
   DataManagement/mitkBoundingObjectGroup.cpp
   DataManagement/mitkCellOperation.cpp
   DataManagement/mitkColorConversions.cpp
   DataManagement/mitkColorSequence.cpp
   DataManagement/mitkColorSequenceCycleH.cpp
   DataManagement/mitkColorSequenceHalfTones.cpp
   DataManagement/mitkColorSequenceRainbow.cpp
   DataManagement/mitkCompressedImageContainer.cpp
   DataManagement/mitkCone.cpp
   DataManagement/mitkContour.cpp
   DataManagement/mitkContourSet.cpp
   DataManagement/mitkCuboid.cpp
   DataManagement/mitkCylinder.cpp
   DataManagement/mitkDataStorageSelection.cpp
   DataManagement/mitkDelegateManager.cpp
   DataManagement/mitkDrawOperation.cpp
   DataManagement/mitkEllipsoid.cpp
   DataManagement/mitkExternAbstractTransformGeometry.cpp
   DataManagement/mitkExtrudedContour.cpp
   DataManagement/mitkFrameOfReferenceUIDManager.cpp
   DataManagement/mitkGridRepresentationProperty.cpp
   DataManagement/mitkGridVolumeMapperProperty.cpp
   DataManagement/mitkItkBaseDataAdapter.cpp
   DataManagement/mitkLabeledImageLookupTable.cpp
   DataManagement/mitkLineOperation.cpp
   DataManagement/mitkMesh.cpp
   DataManagement/mitkObjectSet.cpp
   DataManagement/mitkOrganTypeProperty.cpp
   DataManagement/mitkPlaneLandmarkProjector.cpp
   DataManagement/mitkPlane.cpp
   DataManagement/mitkPropertyManager.cpp
   DataManagement/mitkPropertyObserver.cpp
   DataManagement/mitkSeedsImage.cpp
   DataManagement/mitkSeedsImageLookupTableSource.cpp
   DataManagement/mitkSphereLandmarkProjector.cpp
 # DataManagement/mitkUSLookupTableSource.cpp
   DataManagement/mitkUnstructuredGrid.cpp
   DataManagement/mitkVideoSource.cpp
   DataManagement/vtkObjectSet.cpp
   IO/mitkObjFileIOFactory.cpp
   IO/mitkObjFileReader.cpp
   IO/mitkPACSPlugin.cpp
   IO/mitkParRecFileIOFactory.cpp
   IO/mitkParRecFileReader.cpp
   IO/mitkStlVolumeTimeSeriesIOFactory.cpp
   IO/mitkStlVolumeTimeSeriesReader.cpp
   IO/mitkUnstructuredGridVtkWriter.cpp
   IO/mitkUnstructuredGridVtkWriterFactory.cpp
   IO/mitkVtkUnstructuredGridIOFactory.cpp
   IO/mitkVtkUnstructuredGridReader.cpp
   IO/mitkVtkVolumeTimeSeriesIOFactory.cpp
   IO/mitkVtkVolumeTimeSeriesReader.cpp
   Interactions/mitkAutoSegmentationTool.cpp
   Interactions/mitkConferenceEventMapper.cpp
   Interactions/mitkConnectPointsInteractor.cpp
   Interactions/mitkContourInteractor.cpp
   Interactions/mitkContourTool.cpp
   #Interactions/mitkCoordinateSupplier.cpp
   #Interactions/mitkDisplayCoordinateOperation.cpp
   #Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkAffineInteractor3D.cpp
   Interactions/mitkDisplayPointSetInteractor.cpp
   #Interactions/mitkDisplayVectorInteractor.cpp
   Interactions/mitkExtrudedContourInteractor.cpp
   Interactions/mitkFeedbackContourTool.cpp
   Interactions/mitkInteractionDebug.cpp
   Interactions/mitkInteractionDebugger.cpp
   Interactions/mitkPaintbrushTool.cpp
   Interactions/mitkPointInteractor.cpp
   Interactions/mitkPointSelectorInteractor.cpp
   #Interactions/mitkPositionTracker.cpp
   Interactions/mitkSeedsInteractor.cpp
   Interactions/mitkSegTool2D.cpp
   Interactions/mitkSegmentationsProcessingTool.cpp
   Interactions/mitkSetRegionTool.cpp
   Interactions/mitkSocketClient.cpp
   Interactions/mitkSurfaceDeformationInteractor3D.cpp
   Interactions/mitkSurfaceInteractor.cpp
   Interactions/mitkTool.cpp
   Interactions/mitkAddContourTool.cpp
   Interactions/mitkAutoCropTool.cpp
   Interactions/mitkBinaryThresholdTool.cpp
   Interactions/mitkCalculateGrayValueStatisticsTool.cpp
   Interactions/mitkCalculateVolumetryTool.cpp
   Interactions/mitkCorrectorTool2D.cpp
   Interactions/mitkCreateSurfaceTool.cpp
   Interactions/mitkEraseRegionTool.cpp
   Interactions/mitkFillRegionTool.cpp
   Interactions/mitkRegionGrowingTool.cpp
   Interactions/mitkSubtractContourTool.cpp
   Interactions/mitkDrawPaintbrushTool.cpp
   Interactions/mitkErasePaintbrushTool.cpp
   Interactions/mitkMorphologicTool.cpp
   Interactions/mitkErodeTool.cpp
   Interactions/mitkDilateTool.cpp
   Interactions/mitkOpeningTool.cpp
   Interactions/mitkClosingTool.cpp
   Interactions/mitkBinaryThresholdULTool.cpp
   Interactions/mitkPixelManipulationTool.cpp
   Interactions/mitkRegionGrow3DTool.cpp
   Rendering/mitkContourMapper2D.cpp
   Rendering/mitkContourSetMapper2D.cpp
   Rendering/mitkContourSetVtkMapper3D.cpp
   Rendering/mitkContourVtkMapper3D.cpp
   Rendering/mitkEnhancedPointSetVtkMapper3D.cpp
   Rendering/mitkImageBackground2D.cpp
   Rendering/mitkLineMapper2D.cpp
 # Rendering/mitkLineVtkMapper3D.cpp
   Rendering/mitkMeshMapper2D.cpp
   Rendering/mitkMeshVtkMapper3D.cpp
   Rendering/mitkNativeRenderWindowInteractor.cpp
 
   Rendering/mitkSplineMapper2D.cpp
   Rendering/mitkSplineVtkMapper3D.cpp
   Rendering/mitkUnstructuredGridMapper2D.cpp
   Rendering/mitkUnstructuredGridVtkMapper3D.cpp
   Rendering/mitkVectorImageMapper2D.cpp
   Rendering/vtkUnstructuredGridMapper.cpp
   Rendering/vtkMaskedGlyph2D.cpp
   Rendering/vtkMaskedGlyph3D.cpp
   Rendering/vtkMitkVolumeTextureMapper3D.cpp
   Rendering/vtkMitkOpenGLVolumeTextureMapper3D.cpp
   Rendering/mitkGPUVolumeMapper3D.cpp
   Rendering/vtkMitkGPUVolumeRayCastMapper.cpp
   Rendering/vtkMitkOpenGLGPUVolumeRayCastMapper.cpp
   Rendering/vtkMitkOpenGLGPUVolumeRayCastMapperShaders.cpp
 )
 
 IF(WIN32 AND NOT MINGW)
   SET(CPP_FILES
     Controllers/mitkMovieGeneratorWin32.cpp
     ${CPP_FILES}
   )
 ENDIF(WIN32 AND NOT MINGW)
 
 IF ( ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} VERSION_LESS 5.8 )
   MESSAGE(STATUS "Using VTK 5.8 classes from MITK respository")
   SET(CPP_FILES ${CPP_FILES}
     Algorithms/vtkImageStencilRaster.cxx
     Algorithms/vtkLassoStencilSource.cxx
     )
 ENDIF ( ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} VERSION_LESS 5.8 )