diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
index 19fa450822..3ae0e4890c 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake
@@ -1,98 +1,96 @@
 set(SRC_CPP_FILES
   QmitkDiffusionImagingAppApplication.cpp
   QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
   QmitkDiffusionImagingAppIntroPart.cpp
   QmitkDiffusionImagingAppPerspective.cpp
   QmitkWelcomePerspective.cpp
   QmitkDIAppConnectomicsPerspective.cpp
   QmitkDIAppDicomImportPerspective.cpp
   QmitkDIAppFiberTractographyPerspective.cpp
   QmitkDIAppIVIMPerspective.cpp
   QmitkDIAppPreprocessingReconstructionPerspective.cpp
   QmitkDIAppQuantificationPerspective.cpp
   QmitkDIAppScreenshotsMoviesPerspective.cpp
   QmitkDIAppTBSSPerspective.cpp
   QmitkDIAppVolumeVisualizationPerspective.cpp
-  QmitkDIAppTrackingEvaluationPerspective.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkWelcomeScreenViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/QmitkDiffusionImagingAppIntroPart.h
   src/internal/mitkPluginActivator.h
   src/QmitkDiffusionImagingAppApplication.h
   src/internal/QmitkDiffusionImagingAppPerspective.h
   src/internal/QmitkWelcomePerspective.h
   src/internal/QmitkDIAppConnectomicsPerspective.h
   src/internal/QmitkDIAppDicomImportPerspective.h
   src/internal/QmitkDIAppFiberTractographyPerspective.h
   src/internal/QmitkDIAppIVIMPerspective.h
   src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h
   src/internal/QmitkDIAppQuantificationPerspective.h
   src/internal/QmitkDIAppScreenshotsMoviesPerspective.h
   src/internal/QmitkDIAppTBSSPerspective.h
   src/internal/QmitkDIAppVolumeVisualizationPerspective.h
-  src/internal/QmitkDIAppTrackingEvaluationPerspective.h
 )
 
 set(CACHED_RESOURCE_FILES
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
   plugin.xml
   resources/icon_dicom.xpm
   resources/diffusionimaging.png
   resources/preprocessing.png
   resources/Measurement_48.png
   resources/volvis.png
   resources/perspectives/diffusionimaging.png
   resources/perspectives/icon_home.png
   resources/perspectives/connectomics.png
   resources/perspectives/dicomimport.png
   resources/perspectives/tractography.png
   resources/perspectives/ivim.png
   resources/perspectives/preprocessingreconstruction.png
   resources/perspectives/quantification.png
   resources/perspectives/screenshotsmovies.png
   resources/perspectives/tbss.png
   resources/perspectives/volumevizualization.png
 )
 
 set(QRC_FILES
 # uncomment the following line if you want to use Qt resources
   resources/welcome/QmitkWelcomeScreenView.qrc
   resources/org_mitk_gui_qt_diffusionimagingapp.qrc
 )
 
 # set(CPP_FILES)
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
 
 
 #----------- Qt Help Collection Project -------------#
 
 if(BLUEBERRY_USE_QT_HELP)
   set(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp")
   set(_plugin_qhcp_output "${CMAKE_CURRENT_BINARY_DIR}/MitkDiffusionImagingAppQtHelpCollection.qhc")
   add_custom_command(OUTPUT ${_plugin_qhcp_output}
                      COMMAND ${QT_COLLECTIONGENERATOR_EXECUTABLE} ${_plugin_qhcp_input} -o ${_plugin_qhcp_output}
                      DEPENDS ${_plugin_qhcp_input}
                      )
 
   list(APPEND CACHED_RESOURCE_FILES ${_plugin_qhcp_output})
   #set(FILE_DEPENDENCIES ${_plugin_qhcp_output})
 endif()
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
index d4c20d714a..174abdcf6d 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
@@ -1,73 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.osgi.applications">
     <application id="org.mitk.qt.diffusionimagingapp">
       <run class="QmitkDiffusionImagingAppApplication"/>
     </application>
   </extension>
 
   <extension point="org.blueberry.ui.intro">
     <intro id="org.mitk.qt.diffusionimagingappintro"
       class="QmitkDiffusionImagingAppIntroPart"
       role="editor"/>
     <introProductBinding
       productId=""
       introId="org.mitk.qt.diffusionimagingappintro"/>
   </extension>
 
   <extension point="org.blueberry.ui.perspectives">
 <!--    <perspective id="org.mitk.diffusionimagingapp.perspectives.diffusionimagingapp"
       name="Data Display"
       class="QmitkDiffusionImagingAppPerspective"
       icon="resources/perspectives/icon_home.png"/>-->
 
     <perspective id="org.mitk.diffusionimagingapp.perspectives.welcome"
       name="Data Display"
       class="QmitkWelcomePerspective"
       icon="resources/perspectives/icon_home.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.dicomimport"
       name="DICOM Import"
       class="QmitkDIAppDicomImportPerspective"
       icon="resources/perspectives/dicomimport.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.preprocessingreconstruction"
       name="Preprocessing Reconstruction"
       class="QmitkDIAppPreprocessingReconstructionPerspective"
       icon="resources/perspectives/preprocessingreconstruction.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.quantification"
       name="Quantification"
       class="QmitkDIAppQuantificationPerspective"
       icon="resources/perspectives/quantification.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.ivim"
       name="IVIM"
       class="QmitkDIAppIVIMPerspective"
       icon="resources/perspectives/ivim.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.tbss"
       name="TBSS"
       class="QmitkDIAppTBSSPerspective"
       icon="resources/perspectives/tbss.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.tractography"
       name="Tractography"
       class="QmitkDIAppFiberTractographyPerspective"
       icon="resources/perspectives/tractography.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.connectomics"
       name="Connectomics"
       class="QmitkDIAppConnectomicsPerspective"
       icon="resources/perspectives/connectomics.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.volumevisualization"
       name="Volume Visualization"
       class="QmitkDIAppVolumeVisualizationPerspective"
       icon="resources/perspectives/volumevizualization.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.screenshotsmovies"
       name="Screenshots Movies"
       class="QmitkDIAppScreenshotsMoviesPerspective"
       icon="resources/perspectives/screenshotsmovies.png"/>
-    <perspective id="org.mitk.diffusionimagingapp.perspectives.trackingevaluation"
-      name="Tracking Evaluation"
-      class="QmitkDIAppTrackingEvaluationPerspective"
-      icon="resources/perspectives/screenshotsmovies.png"/>
 
   </extension>
 
 </plugin>
 
diff --git a/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp
index b251a54b97..c08bb4b388 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp
@@ -1,138 +1,136 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date$
  Version:   $Revision$
 
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html 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 notices for more information.
 
  =========================================================================*/
 
 #include "mitkPluginActivator.h"
 #include <QtPlugin>
 #include <mitkVersion.h>
 #include <berryQtAssistantUtil.h>
 
 #include "src/QmitkDiffusionImagingAppApplication.h"
 
 #include "QmitkWelcomePerspective.h"
 #include "src/internal/QmitkDiffusionImagingAppIntroPart.h"
 #include "src/internal/QmitkDiffusionImagingAppPerspective.h"
 
 #include "src/internal/QmitkDIAppConnectomicsPerspective.h"
 #include "src/internal/QmitkDIAppDicomImportPerspective.h"
 #include "src/internal/QmitkDIAppFiberTractographyPerspective.h"
 #include "src/internal/QmitkDIAppIVIMPerspective.h"
 #include "src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h"
 #include "src/internal/QmitkDIAppQuantificationPerspective.h"
 #include "src/internal/QmitkDIAppScreenshotsMoviesPerspective.h"
 #include "src/internal/QmitkDIAppTBSSPerspective.h"
 #include "src/internal/QmitkDIAppVolumeVisualizationPerspective.h"
-#include "src/internal/QmitkDIAppTrackingEvaluationPerspective.h"
 
 #include <QFileInfo>
 #include <QDateTime>
 
 mitkPluginActivator* mitkPluginActivator::inst = 0;
 
 mitkPluginActivator::mitkPluginActivator()
     : pluginListener(0)
 {
   inst = this;
 }
 
 mitkPluginActivator::~mitkPluginActivator()
 {
   delete pluginListener;
 }
 
 mitkPluginActivator* mitkPluginActivator::GetDefault()
 {
   return inst;
 }
 
 void mitkPluginActivator::start(ctkPluginContext* context)
 {
   berry::AbstractUICTKPlugin::start(context);
 
   this->context = context;
 
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionImagingAppApplication, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionImagingAppIntroPart, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionImagingAppPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkWelcomePerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppConnectomicsPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppDicomImportPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppFiberTractographyPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppIVIMPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppPreprocessingReconstructionPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppQuantificationPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppScreenshotsMoviesPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppTBSSPerspective, context)
   BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppVolumeVisualizationPerspective, context)
-  BERRY_REGISTER_EXTENSION_CLASS(QmitkDIAppTrackingEvaluationPerspective, context)
 
   delete pluginListener;
   pluginListener = new berry::QCHPluginListener(context);
   context->connectPluginListener(pluginListener, SLOT(pluginChanged(ctkPluginEvent)), Qt::DirectConnection);
 
   // register all QCH files from all the currently installed plugins
   pluginListener->processPlugins();
 
 
 }
 
 QString mitkPluginActivator::GetQtHelpCollectionFile() const
 {
 
     if (!helpCollectionFile.isEmpty())
     {
       return helpCollectionFile;
     }
 
     QString collectionFilename;
     QString na("n/a");
 //    if (na != MITK_REVISION)
 //      collectionFilename = "MitkDiffusionImagingAppQtHelpCollection_" MITK_REVISION ".qhc";
 //    else
       collectionFilename = "MitkDiffusionImagingAppQtHelpCollection.qhc";
 
     QFileInfo collectionFileInfo = context->getDataFile(collectionFilename);
     QFileInfo pluginFileInfo = QFileInfo(QUrl(context->getPlugin()->getLocation()).toLocalFile());
     if (!collectionFileInfo.exists() ||
         pluginFileInfo.lastModified() > collectionFileInfo.lastModified())
     {
       // extract the qhc file from the plug-in
       QByteArray content = context->getPlugin()->getResource(collectionFilename);
       if (content.isEmpty())
       {
         BERRY_WARN << "Could not get plug-in resource: " << collectionFilename.toStdString();
       }
       else
       {
         QFile file(collectionFileInfo.absoluteFilePath());
         file.open(QIODevice::WriteOnly);
         file.write(content);
         file.close();
       }
     }
 
     if (QFile::exists(collectionFileInfo.absoluteFilePath()))
     {
       helpCollectionFile = collectionFileInfo.absoluteFilePath();
     }
 
     return helpCollectionFile;
 
 }
 
 Q_EXPORT_PLUGIN2(org_mitk_gui_qt_diffusionimagingapp, mitkPluginActivator)