diff --git a/macro/mvd/qa/mvd_qa1_transUrqmd.C b/macro/mvd/qa/mvd_qa1_transUrqmd.C
index 6ad2d6d3931963f9afc19fc40ccf74eccc305d0a..f9730d52387eee18c28118c0e4e915a0ff81628a 100644
--- a/macro/mvd/qa/mvd_qa1_transUrqmd.C
+++ b/macro/mvd/qa/mvd_qa1_transUrqmd.C
@@ -163,7 +163,7 @@ void mvd_qa1_transUrqmd(const char* setup = "sis100_electron")
   // --- Uniform distribution of event plane angle
   primGen->SetEventPlane(0., 2. * TMath::Pi());
   // --- Get target parameters
-  TVector3 targetPos(0., 0., -44.);
+  TVector3 targetPos(0., 0., 0.);
   Double_t tDz = 0.;
   if (target) {
     targetPos = target->GetPosition();
diff --git a/mvd/CMakeLists.txt b/mvd/CMakeLists.txt
index b8696c1a120d026e652ec1f52bddbbdd9f7e0ee2..db2f3ece2e83a70ff01813f4a24c82d268905217 100644
--- a/mvd/CMakeLists.txt
+++ b/mvd/CMakeLists.txt
@@ -13,8 +13,8 @@ set(INCLUDE_DIRECTORIES
 set(SRCS
   plugins/tasks/CbmMvdSensorTask.cxx
   plugins/tasks/CbmMvdSensorDigitizerTask.cxx
-  plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
-  plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+  #plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
+  #plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
   #OLD
   plugins/tasks/CbmMvdSensorHitfinderTask.cxx
   plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -43,13 +43,13 @@ set(SRCS
   CbmMvdStationPar.cxx
   CbmMvdDetector.cxx
   CbmMvdSensor.cxx
-  CbmMvdDigiToHit.cxx
- # CbmMvdDigiToHitTB.cxx
+# CbmMvdDigiToHit.cxx
+# CbmMvdDigiToHit.cxx
   CbmMvdTrackingInterface.cxx
   
   #OLD
   CbmMvdClusterfinder.cxx
-  CbmMvdClusterfinderTB.cxx
+  #CbmMvdClusterfinderTB.cxx
   ####
   CbmMvdReadout.cxx
   )
@@ -105,8 +105,8 @@ install(FILES plugins/buffers/CbmMvdSensorBuffer.h
        )
 install(FILES plugins/tasks/CbmMvdSensorClusterfinderTask.h
               plugins/tasks/CbmMvdSensorDigitizerTask.h
-              plugins/tasks/CbmMvdSensorDigitizerTBTask.h
-              plugins/tasks/CbmMvdSensorDigiToHitTask.h
+              #plugins/tasks/CbmMvdSensorDigitizerTBTask.h
+              #plugins/tasks/CbmMvdSensorDigiToHitTask.h
               plugins/tasks/CbmMvdSensorFindHitTask.h
               plugins/tasks/CbmMvdSensorHitfinderTask.h
               plugins/tasks/CbmMvdSensorTask.h
diff --git a/mvd/CbmMvdLinkDef.h b/mvd/CbmMvdLinkDef.h
index 7da6cd1484eb1493addd488138cd91598d48e0f2..a83aaa53745dd63137296c02a86884ebbcc13454 100644
--- a/mvd/CbmMvdLinkDef.h
+++ b/mvd/CbmMvdLinkDef.h
@@ -15,9 +15,9 @@
 //#pragma link C++ class CbmMvdDigitizerTB+;
 #pragma link C++ class CbmMvdHitfinder + ;
 #pragma link C++ class CbmMvdClusterfinder + ;
-#pragma link C++ class CbmMvdDigiToHit + ;
-#pragma link C++ class CbmMvdClusterfinderTB + ;
-#pragma link C++ class CbmMvdDigiToHitTB + ;
+//#pragma link C++ class CbmMvdDigiToHit + ;
+//#pragma link C++ class CbmMvdClusterfinderTB + ;
+//#pragma link C++ class CbmMvdDigiToHitTB + ;
 #pragma link C++ class CbmMvdReadout + ;
 
 #pragma link C++ class CbmMvdPileupManager + ;
@@ -43,10 +43,10 @@
 #pragma link C++ class CbmMvdSensorHitfinderTask + ;  //OLD
 #pragma link C++ class CbmMvdSensorDigitizerTask + ;
 #pragma link C++ class CbmMvdSensorReadoutTask + ;
-#pragma link C++ class CbmMvdSensorDigitizerTBTask + ;
+//#pragma link C++ class CbmMvdSensorDigitizerTBTask + ;
 #pragma link C++ class CbmMvdSensorClusterfinderTask + ;  //OLD
 //KHUN
-#pragma link C++ class CbmMvdSensorDigiToHitTask + ;
+//#pragma link C++ class CbmMvdSensorDigiToHitTask + ;
 
 
 #pragma link C++ class CbmMvdGeoHandler + ;
diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx
index 894f703b220b70bc6ffa451d1e1ee89681bae061..c2782f658ba24b179716a88c421a553eff91f79f 100644
--- a/mvd/CbmMvdSensor.cxx
+++ b/mvd/CbmMvdSensor.cxx
@@ -16,7 +16,7 @@
 #include "plugins/tasks/CbmMvdSensorClusterfinderTask.h"  //not needed khun
 
 #include "plugins/tasks/CbmMvdSensorDigiToHitTask.h"
-#include "plugins/tasks/CbmMvdSensorDigitizerTBTask.h"
+//#include "plugins/tasks/CbmMvdSensorDigitizerTBTask.h"
 #include "plugins/tasks/CbmMvdSensorDigitizerTask.h"
 //#include "plugins/tasks/CbmMvdSensorFindHitTask.h"
 #include "plugins/tasks/CbmMvdSensorHitfinderTask.h"  //not needed khun