diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index 1ca43ce47d1c2..4c02cc22bc5eb 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -2,5 +2,5 @@ add_subdirectory (flp2epn)
 add_subdirectory (flp2epn-distributed)
 if(ALIROOT)
   add_subdirectory (hough)
-  add_subdirectory (aliceHLTwrapper)
 endif(ALIROOT)
+add_subdirectory (aliceHLTwrapper)
diff --git a/devices/aliceHLTwrapper/Component.cxx b/devices/aliceHLTwrapper/Component.cxx
index e0f173f4afef1..64dd44e4b8930 100644
--- a/devices/aliceHLTwrapper/Component.cxx
+++ b/devices/aliceHLTwrapper/Component.cxx
@@ -264,7 +264,7 @@ int Component::process(vector<MessageFormat::BufferDesc_t>& dataArray,
   } while (iResult == ENOSPC && --nofTrials > 0);
 
   // prepare output
-  if (outputBlockCnt >= 0) {
+  { // keep this after removing condition to preserve formatting
     AliHLTUInt8_t* pOutputBufferStart = &mOutputBuffer[0];
     AliHLTUInt8_t* pOutputBufferEnd = pOutputBufferStart + mOutputBuffer.size();
     // consistency check for data blocks
diff --git a/devices/aliceHLTwrapper/EventSampler.cxx b/devices/aliceHLTwrapper/EventSampler.cxx
index 5defe1f668431..81833833dd28f 100644
--- a/devices/aliceHLTwrapper/EventSampler.cxx
+++ b/devices/aliceHLTwrapper/EventSampler.cxx
@@ -175,16 +175,6 @@ void EventSampler::Pause()
   FairMQDevice::Pause();
 }
 
-void EventSampler::Shutdown()
-{
-  /// inherited from FairMQDevice
-
-  int iResult=0;
-  // TODO: shutdown component and delete instance
-
-  FairMQDevice::Shutdown();
-}
-
 void EventSampler::SetProperty(const int key, const string& value)
 {
   /// inherited from FairMQDevice
diff --git a/devices/aliceHLTwrapper/EventSampler.h b/devices/aliceHLTwrapper/EventSampler.h
index 9908e4c6aaf62..29dcca7e0bbe6 100644
--- a/devices/aliceHLTwrapper/EventSampler.h
+++ b/devices/aliceHLTwrapper/EventSampler.h
@@ -48,8 +48,6 @@ class EventSampler : public FairMQDevice {
   /// inherited from FairMQDevice
   virtual void Pause();
   /// inherited from FairMQDevice
-  virtual void Shutdown();
-  /// inherited from FairMQDevice
   /// handle device specific properties and forward to FairMQDevice::SetProperty
   virtual void SetProperty(const int key, const std::string& value);
   /// inherited from FairMQDevice