diff --git a/Modules/AlgorithmsExt/mitkUnstructuredGridToUnstructuredGridFilter.cpp b/Modules/AlgorithmsExt/mitkUnstructuredGridToUnstructuredGridFilter.cpp
index d842c90524..f8f7ab0df9 100644
--- a/Modules/AlgorithmsExt/mitkUnstructuredGridToUnstructuredGridFilter.cpp
+++ b/Modules/AlgorithmsExt/mitkUnstructuredGridToUnstructuredGridFilter.cpp
@@ -1,90 +1,89 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include <mitkUnstructuredGridToUnstructuredGridFilter.h>
 
 #include <vtkSmartPointer.h>
 #include <vtkPoints.h>
 #include <vtkUnstructuredGrid.h>
 
 #include <itkImageRegionIterator.h>
 
 #include <mitkImageAccessByItk.h>
 
 
 mitk::UnstructuredGridToUnstructuredGridFilter::UnstructuredGridToUnstructuredGridFilter()
 {
   this->m_UnstructGrid = mitk::UnstructuredGrid::New();
 }
 
 mitk::UnstructuredGridToUnstructuredGridFilter::~UnstructuredGridToUnstructuredGridFilter(){}
 
 void mitk::UnstructuredGridToUnstructuredGridFilter::SetInput(const mitk::UnstructuredGrid* grid)
 {
   this->ProcessObject::SetNthInput(0, const_cast< mitk::UnstructuredGrid* >( grid ) );
 }
 
 void mitk::UnstructuredGridToUnstructuredGridFilter::CreateOutputsForAllInputs(unsigned int  /*idx*/)
 {
   this->SetNumberOfIndexedOutputs( this->GetNumberOfIndexedInputs() );
   for (unsigned int idx = 0; idx < this->GetNumberOfIndexedInputs(); ++idx)
   {
     if (this->GetOutput(idx) == NULL)
     {
-      DataObjectPointer newOutput = this->MakeOutput(idx);
-      this->SetNthOutput(idx, newOutput);
+      mitk::UnstructuredGrid::Pointer newOutputX = mitk::UnstructuredGrid::New();
+      this->SetNthOutput(idx, newOutputX);
     }
-    this->GetOutput( idx )->Graft( this->GetInput( idx) );
   }
   this->Modified();
 }
 
 void mitk::UnstructuredGridToUnstructuredGridFilter::SetInput(unsigned int idx, const mitk::UnstructuredGrid* grid )
 {
   if ( this->GetInput(idx) != grid )
   {
     this->SetNthInput( idx, const_cast<mitk::UnstructuredGrid*>( grid ) );
     this->CreateOutputsForAllInputs(idx);
     this->Modified();
   }
 }
 
 const mitk::UnstructuredGrid* mitk::UnstructuredGridToUnstructuredGridFilter::GetInput(void)
 {
   if (this->GetNumberOfInputs() < 1)
     return NULL;
 
   return static_cast<const mitk::UnstructuredGrid* >( this->ProcessObject::GetInput(0) );
 }
 
 const mitk::UnstructuredGrid* mitk::UnstructuredGridToUnstructuredGridFilter::GetInput( unsigned int idx)
 {
   if (this->GetNumberOfInputs() < 1)
     return NULL;
 
   return static_cast<const mitk::UnstructuredGrid*>(this->ProcessObject::GetInput(idx));
 }
 
 void mitk::UnstructuredGridToUnstructuredGridFilter::GenerateOutputInformation()
 {
   mitk::UnstructuredGrid::ConstPointer inputImage = this->GetInput();
 
   m_UnstructGrid = this->GetOutput();
 
   itkDebugMacro(<<"GenerateOutputInformation()");
 
   if(inputImage.IsNull()) return;
 }
diff --git a/Modules/SurfaceInterpolation/Testing/mitkPointCloudScoringFilterTest.cpp b/Modules/SurfaceInterpolation/Testing/mitkPointCloudScoringFilterTest.cpp
index 5ff33f7c73..7282fe2e2d 100644
--- a/Modules/SurfaceInterpolation/Testing/mitkPointCloudScoringFilterTest.cpp
+++ b/Modules/SurfaceInterpolation/Testing/mitkPointCloudScoringFilterTest.cpp
@@ -1,124 +1,122 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkTestingMacros.h"
 #include <mitkPointCloudScoringFilter.h>
 #include <mitkTestFixture.h>
 #include <mitkUnstructuredGrid.h>
 
 #include <mitkIOUtil.h>
 
 #include <vtkSmartPointer.h>
 #include <vtkPoints.h>
 #include <vtkUnstructuredGrid.h>
-#include <vtkDebugLeaks.h>
 
 class mitkPointCloudScoringFilterTestSuite : public mitk::TestFixture
 {
   CPPUNIT_TEST_SUITE(mitkPointCloudScoringFilterTestSuite);
-  vtkDebugLeaks::SetExitError(0);
   MITK_TEST(testPointCloudScoringFilterInitialization);
   MITK_TEST(testInputs);
   MITK_TEST(testOutput);
   MITK_TEST(testScoring);
   CPPUNIT_TEST_SUITE_END();
 
 private:
 
   mitk::UnstructuredGrid::Pointer m_UnstructuredGrid1;
   mitk::UnstructuredGrid::Pointer m_UnstructuredGrid2;
 
 public:
 
   void setUp()
   {
     m_UnstructuredGrid1 = mitk::UnstructuredGrid::New();
     m_UnstructuredGrid2 = mitk::UnstructuredGrid::New();
 
     vtkSmartPointer<vtkUnstructuredGrid> vtkGrid1 = vtkSmartPointer<vtkUnstructuredGrid>::New();
     vtkSmartPointer<vtkUnstructuredGrid> vtkGrid2 = vtkSmartPointer<vtkUnstructuredGrid>::New();
     vtkSmartPointer<vtkPoints> points1 = vtkSmartPointer<vtkPoints>::New();
     vtkSmartPointer<vtkPoints> points2 = vtkSmartPointer<vtkPoints>::New();
 
     for(int i=0; i<3; i++)
     {
       for(int j=0; j<3; j++)
       {
         for(int k=0; k<3; k++)
         {
           mitk::Point3D point;
           point[0]=i;
           point[1]=j;
           point[2]=k;
 
           points1->InsertNextPoint(point[0],point[1],point[2]);
           points2->InsertNextPoint(point[0]+i,point[1]+i,point[2]+i);
         }
       }
     }
 
     vtkGrid1->SetPoints(points1);
     vtkGrid2->SetPoints(points2);
     m_UnstructuredGrid1->SetVtkUnstructuredGrid(vtkGrid1);
     m_UnstructuredGrid2->SetVtkUnstructuredGrid(vtkGrid2);
   }
 
   void testPointCloudScoringFilterInitialization()
   {
     mitk::PointCloudScoringFilter::Pointer testFilter = mitk::PointCloudScoringFilter::New();
     CPPUNIT_ASSERT_MESSAGE("Testing instantiation of test object", testFilter.IsNotNull());
   }
 
   void testInputs()
   {
     mitk::PointCloudScoringFilter::Pointer testFilter = mitk::PointCloudScoringFilter::New();
     testFilter->SetInput(0, m_UnstructuredGrid1);
     testFilter->SetInput(1, m_UnstructuredGrid2);
 
     mitk::UnstructuredGrid::Pointer uGrid1 = dynamic_cast<mitk::UnstructuredGrid*>(testFilter->GetInputs().at(0).GetPointer());
     mitk::UnstructuredGrid::Pointer uGrid2 = dynamic_cast<mitk::UnstructuredGrid*>(testFilter->GetInputs().at(1).GetPointer());
 
     CPPUNIT_ASSERT_MESSAGE("Testing the first input", uGrid1 == m_UnstructuredGrid1);
     CPPUNIT_ASSERT_MESSAGE("Testing the second input", uGrid2 == m_UnstructuredGrid2);
   }
 
   void testOutput()
   {
     mitk::PointCloudScoringFilter::Pointer testFilter = mitk::PointCloudScoringFilter::New();
     testFilter->SetInput(0, m_UnstructuredGrid1);
     testFilter->SetInput(1, m_UnstructuredGrid2);
     testFilter->Update();
     CPPUNIT_ASSERT_MESSAGE("Testing mitkUnstructuredGrid generation!", testFilter->GetOutput() != NULL);
   }
 
   void testScoring()
   {
     mitk::PointCloudScoringFilter::Pointer testFilter = mitk::PointCloudScoringFilter::New();
     testFilter->SetInput(0, m_UnstructuredGrid2);
     testFilter->SetInput(1, m_UnstructuredGrid1);
     testFilter->Update();
 
     mitk::UnstructuredGrid::Pointer outpGrid = testFilter->GetOutput();
 
     int numBefore = m_UnstructuredGrid1->GetVtkUnstructuredGrid()->GetNumberOfPoints();
     int numAfter = outpGrid->GetVtkUnstructuredGrid()->GetNumberOfPoints();
 
     CPPUNIT_ASSERT_MESSAGE("Testing grid scoring", numBefore > numAfter);
   }
 
 };
 
 MITK_TEST_SUITE_REGISTRATION(mitkPointCloudScoringFilter)