diff --git a/Modules/DiffusionImaging/DiffusionIO/files.cmake b/Modules/DiffusionImaging/DiffusionIO/files.cmake
index 1422e03ba4..5b0f5b3057 100644
--- a/Modules/DiffusionImaging/DiffusionIO/files.cmake
+++ b/Modules/DiffusionImaging/DiffusionIO/files.cmake
@@ -1,41 +1,41 @@
 set(CPP_FILES
   mitkDiffusionModuleActivator.cpp
   mitkNrrdTbssImageWriterFactory.cpp
   #mitkFiberBundleXIOFactory.cpp
   mitkConnectomicsNetworkIOFactory.cpp
   mitkConnectomicsNetworkReader.cpp
   mitkConnectomicsNetworkWriter.cpp
   mitkConnectomicsNetworkSerializer.cpp
   mitkConnectomicsNetworkDefinitions.cpp
   mitkNrrdTbssRoiImageIOFactory.cpp
   #mitkFiberBundleXWriterFactory.cpp
   mitkConnectomicsNetworkWriterFactory.cpp
   mitkNrrdTbssRoiImageWriterFactory.cpp
   mitkNrrdTensorImageReader.cpp
   mitkNrrdTensorImageWriter.cpp
   mitkNrrdTensorImageIOFactory.cpp
   mitkNrrdTensorImageWriterFactory.cpp
   mitkTensorImageSerializer.cpp
   mitkTensorImageSource.cpp
   mitkFiberTrackingObjectFactory.cpp
   mitkConnectomicsObjectFactory.cpp
   mitkQuantificationObjectFactory.cpp
   mitkNrrdTbssImageIOFactory.cpp
   mitkDiffusionCoreObjectFactory.cpp
 
   mitkNrrdDiffusionImageReader.cpp
-  mitkNrrdDiffusionImageIOFactory.cpp
+#  mitkNrrdDiffusionImageIOFactory.cpp
   mitkNrrdDiffusionImageWriterFactory.cpp
   mitkDiffusionImageSerializer.cpp
 
   mitkNrrdQBallImageReader.cpp
   mitkNrrdQBallImageWriter.cpp
   mitkNrrdQBallImageIOFactory.cpp
   mitkNrrdQBallImageWriterFactory.cpp
   mitkQBallImageSerializer.cpp
 
   mitkFiberBundleXMapper2D.cpp
   mitkFiberBundleXMapper3D.cpp
   mitkCompositeMapper.cpp
 )
 
diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.cpp b/Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.cpp
deleted file mode 100644
index 15c5359ace..0000000000
--- a/Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*===================================================================
-
-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 "mitkNrrdDiffusionImageIOFactory.h"
-#include "mitkIOAdapter.h"
-#include "mitkNrrdDiffusionImageReader.h"
-
-#include "itkVersion.h"
-
-
-namespace mitk
-{
-
-NrrdDiffusionImageIOFactory::NrrdDiffusionImageIOFactory()
-{
-  typedef short DiffusionPixelType;
-  typedef itk::VectorImage< DiffusionPixelType, 3 >   DiffusionImageType;
-  typedef NrrdDiffusionImageReader<DiffusionPixelType> NrrdDiffVolReaderType;
-  this->RegisterOverride("mitkIOAdapter",
-                         "mitkNrrdDiffusionImageReader",
-                         "mitk Diffusion Image IO",
-                         1,
-                         itk::CreateObjectFunction<IOAdapter<NrrdDiffVolReaderType> >::New());
-}
-
-NrrdDiffusionImageIOFactory::~NrrdDiffusionImageIOFactory()
-{
-}
-
-const char* NrrdDiffusionImageIOFactory::GetITKSourceVersion() const
-{
-  return ITK_SOURCE_VERSION;
-}
-
-const char* NrrdDiffusionImageIOFactory::GetDescription() const
-{
-  return "NrrdDiffusionImage IO Factory, allows the loading of NRRD DWI data";
-}
-
-} // end namespace mitk
diff --git a/Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.h b/Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.h
deleted file mode 100644
index 59c7176d25..0000000000
--- a/Modules/DiffusionImaging/DiffusionIO/mitkNrrdDiffusionImageIOFactory.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*===================================================================
-
-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.
-
-===================================================================*/
-#ifndef __MITK_NRRD_DIFFUSION_VOULMES_IO_FACTORY_H_HEADER__
-#define __MITK_NRRD_DIFFUSION_VOULMES_IO_FACTORY_H_HEADER__
-
-#ifdef _MSC_VER
-#pragma warning ( disable : 4786 )
-#endif
-
-#include "itkObjectFactoryBase.h"
-#include "mitkBaseData.h"
-
-namespace mitk
-{
-//##Documentation
-//## @brief Create instances of NrrdDiffusionImageReader objects using an object factory.
-//##
-class NrrdDiffusionImageIOFactory : public itk::ObjectFactoryBase
-{
-public:
-  /** Standard class typedefs. */
-  typedef NrrdDiffusionImageIOFactory   Self;
-  typedef itk::ObjectFactoryBase  Superclass;
-  typedef itk::SmartPointer<Self>  Pointer;
-  typedef itk::SmartPointer<const Self>  ConstPointer;
-
-  /** Class methods used to interface with the registered factories. */
-  virtual const char* GetITKSourceVersion(void) const;
-  virtual const char* GetDescription(void) const;
-
-  /** Method for class instantiation. */
-  itkFactorylessNewMacro(Self);
-  static NrrdDiffusionImageIOFactory* FactoryNew() { return new NrrdDiffusionImageIOFactory;}
-  /** Run-time type information (and related methods). */
-  itkTypeMacro(NrrdDiffusionImageIOFactory, ObjectFactoryBase);
-
-  /** Register one factory of this type  */
-  static void RegisterOneFactory(void)
-  {
-    static bool IsRegistered = false;
-    if ( !IsRegistered )
-    {
-      NrrdDiffusionImageIOFactory::Pointer fac = NrrdDiffusionImageIOFactory::New();
-      ObjectFactoryBase::RegisterFactory( fac );
-      IsRegistered = true;
-    }
-  }
-
-protected:
-  NrrdDiffusionImageIOFactory();
-  ~NrrdDiffusionImageIOFactory();
-
-private:
-  NrrdDiffusionImageIOFactory(const Self&); //purposely not implemented
-  void operator=(const Self&); //purposely not implemented
-
-};
-
-
-} // end namespace mitk
-
-#endif  // __MITK_NRRD_DIFFUSION_VOULMES_IO_FACTORY_H_HEADER__