diff --git a/Algorithm/include/Algorithm/BitstreamReader.h b/Algorithm/include/Algorithm/BitstreamReader.h
deleted file mode 100644
index 0a112183ab5ef..0000000000000
--- a/Algorithm/include/Algorithm/BitstreamReader.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef BITSTREAMREADER_H
-#define BITSTREAMREADER_H
-
-/// @file   BitstreamReader.h
-/// @author Matthias Richter
-/// @since  2019-06-05
-/// @brief  Utility class to provide bitstream access to an underlying resource
-
-#include <type_traits>
-#include <bitset>
-
-namespace o2
-{
-namespace algorithm
-{
-
-/// @class BitStreamReader
-/// @brief Utility class to provide bitstream access to an underlying resource
-///
-/// Allows to access bits of variable length, supports integral types and also
-/// bitsets as target type. At the moment, the access is in direction MSB -> LSB.
-///
-///     BitstreamReader<uint8_t> reader(start, end);
-///     while (reader.good() && not reader.eof()) {
-///       // get an 8 bit value from the stream, moves the position
-///       uint8_t ivalue;
-///       reader.get(ivalue);
-///
-///       // get a 13 bit bitset without moving the position
-///       std::bitset<13> value;
-///       reader.peek(value, value.size());
-///       // e.g. use 7 bits of the data
-///       value >>= value.size() - 7;
-///       // move position by the specific number of bits
-///       reader.seek(7);
-///     }
-template <typename BufferType>
-class BitstreamReader
-{
- public:
-  using self_type = BitstreamReader<BufferType>;
-  // for the moment we simply use pointers, but with some traits this can be extended to
-  // containers
-  using value_type = BufferType;
-  using iterator = const value_type*;
-  static constexpr size_t value_size = sizeof(value_type) * 8;
-  BitstreamReader() = delete;
-  BitstreamReader(iterator start, iterator end)
-    : mStart(start), mEnd(end), mCurrent(mStart), mBitPosition(value_size)
-  {
-  }
-  ~BitstreamReader() = default;
-
-  /// Check reader's state
-  /// @return true if not in error state
-  bool good() const
-  {
-    return mBitPosition > 0;
-  }
-
-  /// Indicates end of data
-  /// @return true if end of resource is reached
-  bool eof() const
-  {
-    return mCurrent == mEnd && mBitPosition > 0;
-  }
-
-  /// Reset the reader, start over at beginning
-  void reset()
-  {
-    mCurrent = mStart;
-    mBitPosition = value_size;
-  }
-
-  /// Get the next N bits without moving the read position
-  /// if bitlength is smaller than the size of data type, result is aligned to LSB
-  /// TODO: this also works nicely for bitsets, but then the bitlength has to be specified
-  /// as template parameter, want to do a specific overload, but needs more work to catch
-  /// all cases.
-  /// @param v  target variable passed by reference
-  /// @return number of poked bits
-  template <typename T, size_t N = sizeof(T) * 8>
-  size_t peek(T& v)
-  {
-    static_assert(N <= sizeof(T) * 8);
-    return peek<T, false>(v, N);
-  }
-
-  /// Get the next n bits without moving the read position
-  /// if bitlength is smaller than the size of data type, result is aligned to LSB
-  /// @param v          target variable passed by reference
-  /// @param bitlength  number of bits to read
-  /// @return number of poked bits
-  template <typename T>
-  size_t peek(T& v, size_t bitlength)
-  {
-    return peek<T, true>(v, bitlength);
-  }
-
-  /// Move read position
-  /// @param bitlength  move count in number of bits
-  void seek(size_t bitlength)
-  {
-    while (good() && bitlength > 0 && mCurrent != mEnd) {
-      if (bitlength >= mBitPosition) {
-        bitlength -= mBitPosition;
-        mBitPosition = 0;
-      } else {
-        mBitPosition -= bitlength;
-        bitlength = 0;
-      }
-      if (mBitPosition == 0) {
-        mCurrent++;
-        mBitPosition = value_size;
-      }
-    }
-
-    if (bitlength > 0) {
-      mBitPosition = 0;
-    }
-  }
-
-  /// Get the next n bits and move the read position
-  template <typename T, size_t N = sizeof(T) * 8>
-  T get()
-  {
-    T result;
-    peek<T, N>(result);
-    seek(N);
-    return result;
-  }
-
-  /// Get the next n and move the read position
-  template <typename T>
-  T get(size_t bitlength = sizeof(T) * 8)
-  {
-    T result;
-    peek<T>(result, bitlength);
-    seek(bitlength);
-    return result;
-  }
-
-  /// @class Bits
-  /// @brief Helper class to get value of specified type which holds the number used bits
-  ///
-  /// The class holds both the extracted value access via peek method and the number of used
-  /// bits. The reader will be incremented when the object is destroyed.
-  /// The number of bits can be adjusted by using markUsed method
-  template <typename FieldType, size_t N = sizeof(FieldType) * 8, typename ParentType = self_type>
-  class Bits
-  {
-   public:
-    using field_type = FieldType;
-    static_assert(N <= sizeof(FieldType) * 8);
-    Bits()
-      : mParent(nullptr), mData(0), mLength(0)
-    {
-    }
-    Bits(ParentType* parent, FieldType&& data)
-      : mParent(parent), mData(std::move(data)), mLength(N)
-    {
-    }
-    Bits(Bits&& other)
-      : mParent(other.mParent), mData(std::move(other.mData)), mLength(other.mLength)
-    {
-      other.mParent = nullptr;
-      other.mLength = 0;
-    }
-
-    ~Bits()
-    {
-      if (mParent) {
-        mParent->seek(mLength);
-      }
-    }
-
-    auto& operator=(Bits<FieldType, N, ParentType>&& other)
-    {
-      mParent = other.mParent;
-      mData = std::move(other.mData);
-      mLength = other.mLength;
-      other.mParent = nullptr;
-      other.mLength = 0;
-
-      return *this;
-    }
-
-    FieldType& operator*()
-    {
-      return mData;
-    }
-
-    void markUsed(size_t length)
-    {
-      mLength = length;
-    }
-
-   private:
-    ParentType* mParent;
-    FieldType mData;
-    size_t mLength;
-  };
-
-  /// Read an integral value from the stream
-  template <typename T, std::enable_if_t<std::is_integral<T>::value, int> = 0>
-  self_type& operator>>(T& target)
-  {
-    target = get<T>();
-    return *this;
-  }
-
-  /// Read a bitstream value from the stream
-  template <size_t N>
-  self_type& operator>>(std::bitset<N>& target)
-  {
-    target = get<std::bitset<N>, N>();
-    return *this;
-  }
-
-  /// Read a Bits object from the stream
-  template <typename T>
-  self_type& operator>>(Bits<T>& target)
-  {
-    T bitfield;
-    peek<T>(bitfield);
-    target = std::move(Bits<T>(this, std::move(bitfield)));
-    return *this;
-  }
-
- private:
-  /// The internal peek method
-  template <typename T, bool RuntimeCheck>
-  size_t peek(T& result, size_t bitlength)
-  {
-    if constexpr (RuntimeCheck) {
-      // the runtime check is disabled if bitlength is derived at compile time
-      if (bitlength > sizeof(T) * 8) {
-        throw std::length_error(std::string("requested bit length ") + std::to_string(bitlength) + " does not fit size of result data type " + std::to_string(sizeof(T) * 8));
-      }
-    }
-    result = 0;
-    size_t bitsToWrite = bitlength;
-    auto current = mCurrent;
-    auto bitsAvailable = mBitPosition;
-    while (bitsToWrite > 0 && current != mEnd) {
-      // extract available bits
-      value_type mask = ~value_type(0) >> (value_size - bitsAvailable);
-      if (bitsToWrite >= bitsAvailable) {
-        T value = (*current & mask) << (bitsToWrite - bitsAvailable);
-        result |= value;
-        bitsToWrite -= bitsAvailable;
-        bitsAvailable = 0;
-      } else {
-        value_type value = (*current & mask) >> (bitsAvailable - bitsToWrite);
-        result |= value;
-        bitsAvailable -= bitsToWrite;
-        bitsToWrite = 0;
-      }
-      if (bitsAvailable == 0) {
-        current++;
-        bitsAvailable = value_size;
-      }
-    }
-
-    return bitlength - bitsToWrite;
-  }
-
-  /// start of resource
-  iterator mStart;
-  /// end of resource
-  iterator mEnd;
-  /// current position in resource
-  iterator mCurrent;
-  /// bit position in current element
-  size_t mBitPosition;
-};
-} // namespace algorithm
-} // namespace o2
-#endif
diff --git a/Algorithm/test/test_BitstreamReader.cxx b/Algorithm/test/test_BitstreamReader.cxx
deleted file mode 100644
index 41e3b47f5f276..0000000000000
--- a/Algorithm/test/test_BitstreamReader.cxx
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   test_BitstreamReader.cxx
-/// @author Matthias Richter
-/// @since  2019-06-05
-/// @brief  Test program for BitstreamReader utility
-
-#define BOOST_TEST_MODULE Algorithm BitstreamReader unit test
-#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include <iostream>
-#include <iomanip>
-#include <array>
-#include <vector>
-#include <bitset>
-#include "../include/Algorithm/BitstreamReader.h"
-
-namespace o2
-{
-namespace algorithm
-{
-
-BOOST_AUTO_TEST_CASE(test_BitstreamReader_basic)
-{
-  std::array<uint8_t, 8> data = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f'};
-  std::array<uint8_t, 10> expected7bit = {0x32, 0x19, 0x2c, 0x16, 0x23, 0x09, 0x4a, 0x65, 0x33, 0x0};
-  auto reference = expected7bit.begin();
-  constexpr size_t totalBits = data.size() * sizeof(decltype(data)::value_type) * 8;
-  size_t bitsRead = 0;
-
-  BitstreamReader<uint8_t> reader(data.data(), data.data() + data.size());
-  while (bitsRead < totalBits) {
-    BOOST_REQUIRE(reference != expected7bit.end());
-    BOOST_CHECK(reader.eof() == false);
-    uint8_t value;
-    reader.peek(value);
-    // we use 7 bits of the data
-    value >>= 1;
-    reader.seek(7);
-    bitsRead += 7;
-    // in the last call should there is not enough data
-    BOOST_CHECK(reader.good() == (bitsRead <= totalBits));
-    BOOST_REQUIRE(reference != expected7bit.end());
-    //std::cout << "value " << (int)value << "  expected " << (int)*reference << std::endl;
-    BOOST_CHECK(value == *reference);
-    ++reference;
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_BitstreamReader_operator)
-{
-  std::array<uint8_t, 8> data = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f'};
-  std::array<uint8_t, 10> expected7bit = {0x32, 0x19, 0x2c, 0x16, 0x23, 0x09, 0x4a, 0x65, 0x33, 0x0};
-  auto reference = expected7bit.begin();
-  constexpr size_t totalBits = data.size() * sizeof(decltype(data)::value_type) * 8;
-  size_t bitsRead = 0;
-
-  BitstreamReader<uint8_t> reader(data.data(), data.data() + data.size());
-  while (bitsRead < totalBits) {
-    BOOST_REQUIRE(reference != expected7bit.end());
-    BOOST_CHECK(reader.eof() == false);
-    {
-      decltype(reader)::Bits<uint8_t> value;
-      reader >> value;
-      // we use 7 bits of the data
-      *value >>= 1;
-      value.markUsed(7);
-      //std::cout << "value " << (int)*value << "  expected " << (int)*reference << std::endl;
-      BOOST_CHECK(*value == *reference);
-    }
-    bitsRead += 7;
-    // in the last call should there is not enough data
-    BOOST_CHECK(reader.good() == (bitsRead <= totalBits));
-    BOOST_REQUIRE(reference != expected7bit.end());
-    ++reference;
-  }
-}
-
-BOOST_AUTO_TEST_CASE(test_BitstreamReader_bitset)
-{
-  std::array<uint8_t, 8> data = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f'};
-  std::array<uint8_t, 10> expected7bit = {0x32, 0x19, 0x2c, 0x16, 0x23, 0x09, 0x4a, 0x65, 0x33, 0x0};
-  auto reference = expected7bit.begin();
-  constexpr size_t totalBits = data.size() * sizeof(decltype(data)::value_type) * 8;
-  size_t bitsRead = 0;
-
-  BitstreamReader<uint8_t> reader(data.data(), data.data() + data.size());
-  while (bitsRead < totalBits) {
-    BOOST_REQUIRE(reference != expected7bit.end());
-    BOOST_CHECK(reader.eof() == false);
-    std::bitset<13> value;
-    reader.peek(value, value.size());
-    // we use 7 bits of the data
-    value >>= value.size() - 7;
-    reader.seek(7);
-    bitsRead += 7;
-    // in the last call should there is not enough data
-    BOOST_CHECK(reader.good() == (bitsRead <= totalBits));
-    BOOST_REQUIRE(reference != expected7bit.end());
-    BOOST_CHECK_MESSAGE(value.to_ulong() == *reference, std::string("mismatch: value ") << value.to_ulong() << ",  expected " << (int)*reference);
-    ++reference;
-  }
-
-  reader.reset();
-  std::bitset<16> aBitset;
-  reader >> aBitset;
-  BOOST_CHECK_MESSAGE(aBitset.to_ulong() == 0x6465, std::string("mismatch: value 0x") << std::hex << aBitset.to_ulong() << ",  expected 0x6465");
-}
-
-} // namespace algorithm
-} // namespace o2
diff --git a/DataFormats/Detectors/EMCAL/doxymodules.h b/DataFormats/Detectors/EMCAL/doxymodules.h
deleted file mode 100644
index ed9087569f8c7..0000000000000
--- a/DataFormats/Detectors/EMCAL/doxymodules.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/**
- * @defgroup EMCALDataFormat EMCAL data format
- * @ingroup DetectorEMCAL
- * @brief Data format for EMCAL
- */
\ No newline at end of file
diff --git a/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/EMCALChannelData.h b/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/EMCALChannelData.h
deleted file mode 100644
index 3c014d37e6f9e..0000000000000
--- a/DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/EMCALChannelData.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file EMCALChannelData.h
-/// \brief
-
-/// \class EMCALChannelCalibrator
-/// \brief Class to store the data format for calibraton of the EMCal
-/// \author Hannah Bossi, Yale University
-/// \ingroup DetectorEMCAL
-/// \since Feb 11, 2021
-
-#ifndef ALICEO2_EMCALCHANNELDATA_H
-#define ALICEO2_EMCALCHANNELDATA_H
-
-#include "Rtypes.h"
-
-namespace o2
-{
-namespace dataformats
-{
-class EMCALChannelData
-{
- public:
-  EMCALChannelData(int cellID, int timestamp, int flags = 0, int events) : mEMCALCellID(cellID), mTimestamp(timestamp), mFlags(flags){};
-  EMCALChannelData() = default;
-  ~EMCALChannelData() = default;
-
-  void setEMCALCellID(int index) { mEMCALCellID = index; }
-  int getEMCALCellID() const { return mEMCALCellID; }
-
-  void setTimestamp(int ts) { mTimestamp = ts; }
-  int getTimestamp() const { return mTimestamp; }
-
-  void setFlags(int flags) { mFlags = flags; }
-  float getFlags() const { return mFlags; }
-
- private:
-  int mEMCALCellID;     ///< EMCal Cell ID
-  int mTimestamp;       ///< timestamp in seconds
-  unsigned char mFlags; ///< bit mask with quality flags (to be defined)
-
-  ClassDefNV(EMCALChannelData, 1);
-};
-} // namespace dataformats
-} // namespace o2
-#endif
diff --git a/DataFormats/Detectors/EMCAL/src/EMCALChannelData.cxx b/DataFormats/Detectors/EMCAL/src/EMCALChannelData.cxx
deleted file mode 100644
index 8affa29259f7a..0000000000000
--- a/DataFormats/Detectors/EMCAL/src/EMCALChannelData.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file EMCALChannelData.cxx
-/// \brief Class to store the data format for calibraton of the EMCal
-
-#include "DataFormatsEMCAL/EMCALChannelData.h"
-
-using namespace o2::dataformats;
-
-ClassImp(o2::dataformats::EMCALChannelData;
diff --git a/DataFormats/Detectors/MUON/MCH/src/DsChannelGroup.cxx b/DataFormats/Detectors/MUON/MCH/src/DsChannelGroup.cxx
deleted file mode 100644
index bcf10d74c95ff..0000000000000
--- a/DataFormats/Detectors/MUON/MCH/src/DsChannelGroup.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "DataFormatsMCH/DsChannelGroup.h"
-
-std::string o2::mch::DsChannelId() const
-{
-}
diff --git a/DataFormats/Detectors/ZDC/include/DataFormatsZDC/FEEConfig.h b/DataFormats/Detectors/ZDC/include/DataFormatsZDC/FEEConfig.h
deleted file mode 100644
index b084507b84519..0000000000000
--- a/DataFormats/Detectors/ZDC/include/DataFormatsZDC/FEEConfig.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-//
-// DataFormats/Detectors/ZDC/include/DataFormatsZDC/RawEventData.h
-
-#include "ZDCBase/Constants.h"
-
-#ifndef ALICEO2_ZDC_FEECONFIG_H
-#define ALICEO2_ZDC_FEECONFIG_H
-
-/// \file FEEConfig.h
-/// \brief ZDC FEE configuration
-/// \author pietro.cortese@cern.ch
-
-namespace o2
-{
-namespace zdc
-{
-
-struct FEEFillingMap {
-  uint64_t filling[56];
-};
-
-struct FEEConfigMap {
-  uint32_t address[5 * NChPerModule + 3] = {0, 1, 2, 3,
-                                            4, 5, 6, 7,
-                                            8, 9, 10, 11,
-                                            12, 13, 14, 15,
-                                            16, 17, 18, 19,
-                                            76, 77, 78};
-  uint64_t delay_sample[NChPerModule] = {6, 6, 6, 6};                                   // 4 bits
-  uint64_t delay_coarse[NChPerModule] = {200, 200, 200, 200};                           // 8 bits
-  uint64_t threshold_level[NChPerModule] = {10, 10, 10, 10};                            // 12 bits
-  uint64_t difference_delta[NChPerModule] = {4, 4, 4, 4};                               // 3 bits
-  uint64_t masking_difference[NChPerModule] = {0x00ff00, 0x00ff00, 0x00ff00, 0x00ff00}; // 24 bits
-  uint64_t masking_alicet = 0x00000010;                                                 // 32 bits
-  uint64_t masking_autot = 0xf;                                                         // 4 bits
-  uint64_t masking_readout = 0xf;                                                       // 4 bits
-};
-
-} // namespace zdc
-} // namespace o2
-
-#endif
diff --git a/DataFormats/Headers/include/Headers/SubframeMetadata.h b/DataFormats/Headers/include/Headers/SubframeMetadata.h
deleted file mode 100644
index 255fa0ceb8db6..0000000000000
--- a/DataFormats/Headers/include/Headers/SubframeMetadata.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef SUBFRAMEMETADATA_H
-#define SUBFRAMEMETADATA_H
-
-#include <vector>
-
-namespace o2
-{
-namespace data_flow
-{
-
-struct SubframeMetadata {
-  // TODO: replace with timestamp struct
-  // IDEA: not timeframeID because can be calculcated with helper function
-  // QUESTION: isn't the duration set to ~22ms?
-  uint64_t startTime = ~(uint64_t)0;
-  uint64_t duration = ~(uint64_t)0;
-
-  //further meta data to be added
-
-  // putting data specific to FLP origin
-  int flpIndex;
-};
-
-// Helper function to derive the timeframe id from the actual timestamp.
-// Timestamp is in nanoseconds. Each Timeframe is ~22ms i.e. 2^17 nanoseconds,
-// so we can get a unique id by dividing by the timeframe period and masking
-// the lower 16 bits. Overlaps will only happen every ~ 22 minutes.
-constexpr uint16_t
-  timeframeIdFromTimestamp(uint64_t timestamp, uint64_t timeFrameDuration)
-{
-  return (timestamp / timeFrameDuration) & 0xffff;
-}
-
-// A Mockup class to describe some TPC-like payload
-struct TPCTestCluster {
-  float x = 0.f;
-  float y = 0.f;
-  float z = 1.5f;
-  float q = 0.;
-  uint64_t timeStamp; // the time this thing was digitized/recorded
-};
-
-struct TPCTestPayload {
-  std::vector<TPCTestCluster> clusters;
-};
-
-// a mockup class to describe some "ITS" payload
-struct ITSRawData {
-  float x = -1.;
-  float y = 1.;
-  uint64_t timeStamp;
-};
-
-} // namespace data_flow
-} // namespace o2
-
-#endif
diff --git a/DataFormats/Legacy/HLT/include/AliceHLT/TPCRawCluster.h b/DataFormats/Legacy/HLT/include/AliceHLT/TPCRawCluster.h
deleted file mode 100644
index 59be2a86c3c2b..0000000000000
--- a/DataFormats/Legacy/HLT/include/AliceHLT/TPCRawCluster.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-//-*- Mode: C++ -*-
-
-#ifndef TPCRAWCLUSTER_H
-#define TPCRAWCLUSTER_H
-//****************************************************************************
-//* This file is free software: you can redistribute it and/or modify        *
-//* it under the terms of the GNU General Public License as published by     *
-//* the Free Software Foundation, either version 3 of the License, or        *
-//* (at your option) any later version.                                      *
-//*                                                                          *
-//* Primary Authors: Matthias Richter <richterm@scieq.net>                   *
-//*                                                                          *
-//* The authors make no claims about the suitability of this software for    *
-//* any purpose. It is provided "as is" without express or implied warranty. *
-//****************************************************************************
-
-//  @file   TPCRawCluster.h
-//  @author Matthias Richter
-//  @since  2015-09-27
-//  @brief  ALICE HLT TPC raw cluster structure and tools
-
-#include <iostream>
-#include <fstream> // ifstream
-#include <cstring> // memcpy
-
-namespace o2
-{
-namespace AliceHLT
-{
-
-/**
- * @struct RawCluster
- * This is a redefinition from AliRoot/HLT/TPCLib/AliHLTTPCRawCluster.h for the
- * sake of reading HLT TPC raw cluster files into O2.
- *
- * TODO: there is no dependence on AliRoot, however, a test needs to be added
- * to check consistency if AliRoot is available in the build.
- */
-struct RawCluster {
-
-  int16_t GetPadRow() const { return fPadRow; }
-  float GetPad() const { return fPad; }
-  float GetTime() const { return fTime; }
-  float GetSigmaPad2() const { return fSigmaPad2; }
-  float GetSigmaTime2() const { return fSigmaTime2; }
-  int32_t GetCharge() const { return fCharge; }
-  int32_t GetQMax() const { return fQMax; }
-  bool GetFlagSplitPad() const { return (fFlags & (1 << 0)); }
-  bool GetFlagSplitTime() const { return (fFlags & (1 << 1)); }
-  bool GetFlagSplitAny() const { return (fFlags & 3); }
-  uint16_t GetFlags() const { return (fFlags); }
-
-  int16_t fPadRow;
-  uint16_t fFlags; //Flags: (1 << 0): Split in pad direction
-                   //       (1 << 1): Split in time direction
-                   //During cluster merging, flags are or'd
-  float fPad;
-  float fTime;
-  float fSigmaPad2;
-  float fSigmaTime2;
-  uint16_t fCharge;
-  uint16_t fQMax;
-};
-
-/**
- * @struct RawClusterData
- * Header data struct for a raw cluster block
- */
-struct RawClusterData {
-  uint32_t fVersion;       // version number
-  uint32_t fCount;         // number of clusters
-  RawCluster fClusters[0]; // array of clusters
-};
-
-std::ostream& operator<<(std::ostream& stream, const RawCluster& cluster)
-{
-  stream << "TPCRawCluster:"
-         << " " << cluster.GetPadRow()
-         << " " << cluster.GetPad()
-         << " " << cluster.GetTime()
-         << " " << cluster.GetSigmaPad2()
-         << " " << cluster.GetSigmaTime2()
-         << " " << cluster.GetCharge()
-         << " " << cluster.GetQMax();
-  return stream;
-}
-
-/**
- * @class RawClusterArray Wrapper to binary data block of HLT TPC raw clusters
- * Container class which provides access to the content of a binary block of
- * HLT TPC raw clusters.
- */
-class RawClusterArray
-{
- public:
-  RawClusterArray() : mBuffer(nullptr), mBufferSize(0), mNClusters(0), mClusters(NULL), mClustersEnd(NULL) {}
-  RawClusterArray(const char* filename) : mBuffer(nullptr), mBufferSize(0), mNClusters(0), mClusters(NULL), mClustersEnd(NULL)
-  {
-    init(filename);
-  }
-  RawClusterArray(unsigned char* buffer, int size) : mBuffer(nullptr), mBufferSize(0), mNClusters(0), mClusters(NULL), mClustersEnd(NULL)
-  {
-    init(buffer, size);
-  }
-  ~RawClusterArray() {}
-
-  typedef uint8_t Buffer_t;
-
-  int init(const char* filename)
-  {
-    std::ifstream input(filename, std::ifstream::binary);
-    clear(0);
-    if (input) {
-      // get length of file:
-      input.seekg(0, input.end);
-      int length = input.tellg();
-      input.seekg(0, input.beg);
-
-      // allocate memory:
-      mBuffer = new Buffer_t[length];
-      mBufferSize = length;
-
-      // read data as a block:
-      input.read(reinterpret_cast<char*>(mBuffer), length);
-      if (!input.good()) {
-        clear(-1);
-        std::cerr << "failed to read " << length << " byte(s) from file " << filename << std::endl;
-      }
-
-      input.close();
-      return init();
-    }
-    std::cerr << "failed to open file " << filename << std::endl;
-    return -1;
-  }
-
-  int init(unsigned char* buffer, int size)
-  {
-    if (!buffer || size <= 0)
-      return -1;
-    clear(0);
-    mBuffer = new Buffer_t[size];
-    mBufferSize = size;
-    memcpy(mBuffer, buffer, size);
-    return init();
-  }
-
-  int GetNClusters() const { return mNClusters; }
-
-  RawCluster* begin() { return mClusters; }
-
-  RawCluster* end() { return mClustersEnd; }
-
-  RawCluster& operator[](int i)
-  {
-    if (i + 1 > mNClusters) {
-      // runtime exeption?
-      static RawCluster dummy;
-      return dummy;
-    }
-    return *(mClusters + i);
-  }
-
-  void print() { print(std::cout); }
-
-  template <typename StreamT>
-  StreamT& print(StreamT& stream)
-  {
-    std::cout << "RawClusterArray: " << mNClusters << " cluster(s)" << std::endl;
-    for (RawCluster* cluster = mClusters; cluster != mClustersEnd; cluster++) {
-      std::cout << "  " << *cluster << std::endl;
-    }
-    return stream;
-  }
-
- private:
-  int init()
-  {
-    if (mBuffer == nullptr || mBufferSize == 0)
-      return 0;
-    if (mBufferSize < sizeof(RawClusterData))
-      return -1;
-    RawClusterData& clusterData = *reinterpret_cast<RawClusterData*>(mBuffer);
-
-    if (clusterData.fCount * sizeof(RawCluster) + sizeof(RawClusterData) > mBufferSize) {
-      std::cerr << "Format error, " << clusterData.fCount << " cluster(s) "
-                << "would require "
-                << (clusterData.fCount * sizeof(RawCluster) + sizeof(RawClusterData))
-                << " byte(s), but only " << mBufferSize << " available" << std::endl;
-      return clear(-1);
-    }
-
-    mNClusters = clusterData.fCount;
-    mClusters = clusterData.fClusters;
-    mClustersEnd = mClusters + mNClusters;
-
-    return mNClusters;
-  }
-
-  int clear(int returnValue)
-  {
-    mNClusters = 0;
-    mClusters = NULL;
-    mClustersEnd = NULL;
-    delete[] mBuffer;
-    mBuffer = nullptr;
-    mBufferSize = 0;
-
-    return returnValue;
-  }
-
-  Buffer_t* mBuffer;
-  int mBufferSize;
-  int mNClusters;
-  RawCluster* mClusters;
-  RawCluster* mClustersEnd;
-};
-
-}; // namespace AliceHLT
-}; // namespace o2
-#endif
diff --git a/DataFormats/simulation/include/SimulationDataFormat/ProcessingEventInfo.h b/DataFormats/simulation/include/SimulationDataFormat/ProcessingEventInfo.h
deleted file mode 100644
index 150a8272c7714..0000000000000
--- a/DataFormats/simulation/include/SimulationDataFormat/ProcessingEventInfo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file ProcessingEventInfo.h
-/// \brief Encapsulated meta information about current event being processed by FairRoot (analysis) tasks
-/// \author Sandro Wenzel
-
-#ifndef ALICEO2_DATA_EVENTINFO_H_
-#define ALICEO2_DATA_EVENTINFO_H_
-
-namespace o2
-{
-
-// A class encapsulating meta information about events being process
-// and the data being sent by run classes such as FairRunAna.
-// Can be send to processing tasks for usage so that they do no longer
-// need to access the FairRootManager directly.
-struct ProcessingEventInfo {
-  double eventTime;   //! time of the current event
-  int eventNumber;    //! the current entry
-  int sourceNumber;   //! the current source number
-  bool numberSources; //! number of sources
-  // can be extended further
-};
-
-} // namespace o2
-
-#endif
diff --git a/Detectors/EMCAL/calib/test/testBadChannelScaleFactors.cxx b/Detectors/EMCAL/calib/test/testBadChannelScaleFactors.cxx
deleted file mode 100644
index af0019ba7e593..0000000000000
--- a/Detectors/EMCAL/calib/test/testBadChannelScaleFactors.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#define BOOST_TEST_MODULE Test_EMCAL_Calib
-#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include "EMCALCalib/BadChannelMap.h"
-#include "EMCALCalib/EMCALChannelScaleFactors.h"
-#include "EMCALBase/Geometry.h"
-
-#include <algorithm>
-
-namespace o2
-{
-
-namespace emcal
-{
-
-BOOST_AUTO_TEST_CASE(BadChannelScaleFactor_test)
-{
-
-  auto geo = o2::emcal::Geometry::GetInstanceFromRunNumber(300000);
-
-  struct BadChannelScaleFactorTest {
-    BadChannelScaleFactorTest(int id, float e, float scale) : cellID(id), energy(e), scaleFactor(scale) {}
-    int cellID;
-    float energy;
-    float scaleFactor;
-  };
-
-  std::vector<float> vecEnergyIntervals = {0., 1., 5., 10., 10000};
-  std::vector<BadChannelScaleFactorTest> vecScaleFactors;
-  o2::emcal::EMCALChannelScaleFactors scaleFactors;
-
-  for (int iCell = 0; iCell < geo->GetNCells(); iCell++) {
-    float energy = 100 * ((double)rand() / (RAND_MAX));
-    float scaleFactor = 1.0 + 0.1 * ((double)rand() / (RAND_MAX));
-    vecScaleFactors.push_back(BadChannelScaleFactorTest(iCell, energy, scaleFactor));
-
-    // find index of energy interval
-    auto it = std::find_if(vecEnergyIntervals.begin(), vecEnergyIntervals.end(), [&](float energyInterval) {
-      return energy < energyInterval;
-    });
-    // cout << "iCell: " << iCell << " energy: " << energy << " scaleFactor: " << scaleFactor << " energyInterval: " << *it << endl;
-
-    scaleFactors.insertVal(iCell, vecEnergyIntervals[*it], vecEnergyIntervals[*it + 1], scaleFactor);
-  }
-
-  for (auto& scaleFactor : vecScaleFactors) {
-    float scaleFactorFromMap = scaleFactors.getScaleVal(scaleFactor.cellID, scaleFactor.energy);
-    BOOST_CHECK_CLOSE(scaleFactor.scaleFactor, scaleFactorFromMap, 0.0001);
-  }
-}
-} // namespace emcal
-
-} // namespace o2
\ No newline at end of file
diff --git a/Detectors/EMCAL/doxymodules.h b/Detectors/EMCAL/doxymodules.h
deleted file mode 100644
index 90c822264f6cd..0000000000000
--- a/Detectors/EMCAL/doxymodules.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/**
- * @defgroup DetectorEMCAL EMCAL
- * @brief EMCAL simulation and reconstruction
- *
- * See \ref refDetectorsEMCAL for more information
- */
-
-/**
- * @defgroup EMCALbase EMCAL base
- * @brief Main EMCAL components
- * @ingroup DetectorEMCAL
- *
- * Main EMCAL components used in various libraries
- * - Geometry
- * - Mapping
- * - Basic data types not part of the EMCAL format
- */
-
-/**
- * @defgroup EMCALcalibration EMCAL calibration
- * @brief EMCAL calibration objects
- * @ingroup DetectorEMCAL
- *
- * EMCAL calibration objects for
- * - Bad channel map
- * - Time calibration
- * - Time slewing parameters
- * - Gain calibration
- * - Temperature calibration
- * - FEE DCS parameters
- * - Pedestal data
- * In addition providing an interface convenient CCDB access and methods
- * to recalibrate add cell level.
- */
-
-/**
- * @defgroup EMCALcalib EMCAL calib
- * @brief EMCAL bad channel calibration
- * @ingroup DetectorEMCAL
- *
- * EMCAL calibrator performing
- * - Bad channel calibration
- * - Time calibration
- * and corresponding workflows for calibration tasks.
- */
-
-/**
- * @defgroup EMCALsimulation EMCAL simulation
- * @brief EMCAL simulation code
- * @ingroup DetectorEMCAL
- *
- * EMCAL simulation package. See \ref refEMCALsimulation
- * for more information
- */
-
-/**
- * @defgroup EMCALreconstruction EMCAL reconstruction
- * @brief EMCAL reconstruction code
- * @ingroup DetectorEMCAL
- *
- * EMCAL reconstruction package. See \ref refEMCALreconstruction
- * for more information
- */
-
-/**
- * @defgroup EMCALworkflow EMCAL workflow
- * @brief EMCAL reconstruction workflow
- * @ingroup DetectorEMCAL
- *
- * EMCAL reconstruction workflow package. See \ref refEMCALworkflow
- * for more information.
- */
\ No newline at end of file
diff --git a/Detectors/EMCAL/reconstruction/run/rawReaderTRUDigits.cxx b/Detectors/EMCAL/reconstruction/run/rawReaderTRUDigits.cxx
deleted file mode 100644
index 6fc119dc69521..0000000000000
--- a/Detectors/EMCAL/reconstruction/run/rawReaderTRUDigits.cxx
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file rawReaderFileNew.cxx
-/// \author Markus Fasel <markus.fasel@cern.ch>, Oak Ridge National Laboratory
-
-#include <iostream>
-#include <boost/program_options.hpp>
-
-#include <TTree.h>
-
-#include "DetectorsRaw/RawFileReader.h"
-#include "DetectorsRaw/RDHUtils.h"
-#include "EMCALBase/Mapper.h"
-#include "EMCALBase/TriggerMappingV2.h"
-#include "EMCALReconstruction/AltroDecoder.h"
-#include "EMCALReconstruction/RawReaderMemory.h"
-#include <fairlogger/Logger.h>
-
-namespace bpo = boost::program_options;
-// using namespace o2::emcal;
-
-int main(int argc, char** argv)
-{
-  bpo::variables_map vm;
-  bpo::options_description opt_general("Usage:\n  " + std::string(argv[0]) +
-                                       " <cmds/options>\n"
-                                       "  Tool will decode the DDLx data for EMCAL 0\n"
-                                       "Commands / Options");
-  bpo::options_description opt_hidden("");
-  bpo::options_description opt_all;
-  bpo::positional_options_description opt_pos;
-
-  try {
-    auto add_option = opt_general.add_options();
-    add_option("help,h", "Print this help message");
-    add_option("verbose,v", bpo::value<uint32_t>()->default_value(0), "Select verbosity level [0 = no output]");
-    add_option("version", "Print version information");
-    add_option("input-file,i", bpo::value<std::string>()->required(), "Specifies input file.");
-    add_option("debug,d", bpo::value<uint32_t>()->default_value(0), "Select debug output level [0 = no debug output]");
-
-    opt_all.add(opt_general).add(opt_hidden);
-    bpo::store(bpo::command_line_parser(argc, argv).options(opt_all).positional(opt_pos).run(), vm);
-
-    if (vm.count("help") || argc == 1) {
-      std::cout << opt_general << std::endl;
-      exit(0);
-    }
-
-    if (vm.count("version")) {
-      // std::cout << GitInfo();
-      exit(0);
-    }
-
-    bpo::notify(vm);
-  } catch (bpo::error& e) {
-    std::cerr << "ERROR: " << e.what() << std::endl
-              << std::endl;
-    std::cerr << opt_general << std::endl;
-    exit(1);
-  } catch (std::exception& e) {
-    std::cerr << e.what() << ", application will now exit" << std::endl;
-    exit(2);
-  }
-
-  auto rawfilename = vm["input-file"].as<std::string>();
-
-  o2::raw::RawFileReader reader;
-  reader.setDefaultDataOrigin(o2::header::gDataOriginEMC);
-  reader.setDefaultDataDescription(o2::header::gDataDescriptionRawData);
-  reader.setDefaultReadoutCardType(o2::raw::RawFileReader::RORC);
-  reader.addFile(rawfilename);
-  reader.init();
-
-  o2::emcal::MappingHandler mapper;
-  o2::emcal::TriggerMappingV2 triggermapping;
-
-  std::unique_ptr<TFile> treefile(TFile::Open("trudata.root", "RECREATE"));
-  TTree trudata("trudata", "Tree with TRU data");
-  // branches in tree
-  struct collisiontrigger {
-    unsigned long bc;
-    unsigned long orbit;
-  } mycollision;
-  int absFastOR;
-  int starttime;
-  std::vector<int> timesamples;
-  tree->Branch(&mycollision, "collisiontrigger", "bc,orbit/l");
-  tree->Branch(&starttime, "starttime", "starttime/i");
-  tree->Branch(&timesamples, "timesamples", ""); // @todo check how to write std::vector to tree;
-
-  while (1) {
-    int tfID = reader.getNextTFToRead();
-    if (tfID >= reader.getNTimeFrames()) {
-      LOG(info) << "nothing left to read after " << tfID << " TFs read";
-      break;
-    }
-    std::vector<char> dataBuffer; // where to put extracted data
-    for (int il = 0; il < reader.getNLinks(); il++) {
-      auto& link = reader.getLink(il);
-      std::cout << "Decoding link " << il << std::endl;
-
-      auto sz = link.getNextTFSize(); // size in bytes needed for the next TF of this link
-      dataBuffer.resize(sz);
-      link.readNextTF(dataBuffer.data());
-
-      // Parse
-      o2::emcal::RawReaderMemory parser(dataBuffer);
-      while (parser.hasNext()) {
-        parser.next();
-        auto rdh = parser.getRawHeader();
-        auto ddl = o2::raw::RDHUtils::getFEEID(parser.getRawHeader());
-        // Exclude STU DDLs
-        if (ddl >= 40) {
-          continue;
-        }
-
-        mycollision.bc = o2::raw::RDHUtils::getTriggerBC(rdh);
-        mycollision.orbit = o2::raw::RDHUtils::getTriggerOrbit(rdh);
-
-        o2::emcal::AltroDecoder decoder(parser);
-        decoder.decode();
-        auto& ddlmapping = mapper.getMappingForDDL(ddl);
-
-        std::cout << decoder.getRCUTrailer() << std::endl;
-        for (auto& chan : decoder.getChannels()) {
-          if (ddlmapping.getChannelType(chan.getHardwareAddress) != o2::emcal::ChannelType_t::TRU) {
-            continue;
-          }
-          std::cout << "Hw address: " << chan.getHardwareAddress() << std::endl;
-          // Get absolute FastOR index - this will tell us where on the EMCAL surface the FastOR is
-          // TRU index is encoded in column, needs to be converted to an absoluted FastOR ID via the
-          // trigger mapping. The absoluted FastOR ID can be connected via the geometry to tower IDs
-          // from the FEC data.
-          // we are only interested in the FastORs for now, skip patches starting from 96
-          auto fastorInTRU = ddlmapping.getColumn(chan.getHardwareAddress());
-          if (fastorInTRU >= 96) {
-            // indices starting from 96 encode patches, not FastORs
-            continue;
-          }
-          auto truindex = triggermapping.getTRUIndexFromOnlineHardareAddree(chan.getHardwareAddress(), ddl, ddl / 2);
-          auto absFastOrID = triggermapping.getAbsFastORIndexFromIndexInTRU(truindex, fastorInTRU);
-
-          for (auto& bunch : chan.getBunches()) {
-            std::cout << "BunchLength: " << int(bunch.getBunchLength()) << std::endl;
-            auto adcs = bunch.getADC();
-            int time = bunch.getStartTime();
-            starttime = time;
-            timesamples.clear();
-            timesamples.resize(adcs.size());
-            std::copy(adcs.begin(), adcs.end(), timesamples.begin());
-            trudata.Fill();
-            for (int i = adcs.size() - 1; i >= 0; i--) {
-              std::cout << "Timebin " << time << ", ADC " << adcs[i] << std::endl;
-              time--;
-            }
-          }
-        }
-      }
-    }
-    reader.setNextTFToRead(++tfID);
-  }
-}
\ No newline at end of file
diff --git a/Detectors/FIT/FDD/reconstruction/include/FDDReconstruction/ReadRaw.h b/Detectors/FIT/FDD/reconstruction/include/FDDReconstruction/ReadRaw.h
deleted file mode 100644
index 54c8b7b203edb..0000000000000
--- a/Detectors/FIT/FDD/reconstruction/include/FDDReconstruction/ReadRaw.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file ReadRaw.h
-/// \brief Reads raw data and converts to digits
-/// \author Maciej.Slupecki@cern.ch, arvind.khuntia@cern.ch, based on the FT0 code
-// RAW data format description: DataFormat/Detectors/FIT/FDD/RawEventData
-
-#ifndef ALICEO2_FDD_READRAW_H_
-#define ALICEO2_FDD_READRAW_H_
-
-#include <fstream>
-#include <iostream>
-#include <iomanip>
-#include <map>
-#include <string>
-#include <sstream>
-#include <vector>
-#include "TBranch.h"
-#include "TTree.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFDD/ChannelData.h"
-#include "DataFormatsFDD/LookUpTable.h"
-#include "DataFormatsFDD/RawEventData.h"
-
-namespace o2
-{
-namespace fdd
-{
-class ReadRaw
-{
- public:
-  ReadRaw() = default;
-  ReadRaw(bool doConversionToDigits, const std::string inputRawFilePath = "fdd.raw", const std::string outputRawFilePath = "fdddigitsFromRaw.root");
-  void readRawData(const LookUpTable& lut);
-  void writeDigits(const std::string& outputDigitsFilePath);
-  void close();
-
- private:
-  std::ifstream mRawFileIn;
-  std::map<o2::InteractionRecord, std::vector<ChannelData>> mDigitAccum; // digit accumulator
-
-  template <typename T>
-  TBranch* getOrMakeBranch(TTree& tree, std::string brname, T* ptr)
-  {
-    if (auto br = tree.GetBranch(brname.c_str())) {
-      br->SetAddress(static_cast<void*>(ptr));
-      return br;
-    }
-    // otherwise make it
-    return tree.Branch(brname.c_str(), ptr);
-  }
-
-  ClassDefNV(ReadRaw, 1);
-};
-
-} // namespace fdd
-} // namespace o2
-#endif
diff --git a/Detectors/FIT/FDD/simulation/include/FDDSimulation/Digits2Raw.h b/Detectors/FIT/FDD/simulation/include/FDDSimulation/Digits2Raw.h
deleted file mode 100644
index 4afcf5da37ae8..0000000000000
--- a/Detectors/FIT/FDD/simulation/include/FDDSimulation/Digits2Raw.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file Digits2Raw.h
-/// \brief converts digits to raw format
-/// \author Maciej.Slupecki@cern.ch
-// based on FV0
-
-#ifndef ALICEO2_FDD_DIGITS2RAW_H_
-#define ALICEO2_FDD_DIGITS2RAW_H_
-
-#include "Headers/RAWDataHeader.h"
-#include "CommonDataFormat/InteractionRecord.h"
-#include "DataFormatsFDD/RawEventData.h"
-#include "DataFormatsFDD/LookUpTable.h"
-#include "DataFormatsFDD/ChannelData.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DetectorsRaw/HBFUtils.h"
-#include "DetectorsRaw/RawFileWriter.h"
-#include <fairlogger/Logger.h>
-#include <TStopwatch.h>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <gsl/span>
-
-namespace o2
-{
-namespace fdd
-{
-class Digits2Raw
-{
- public:
-  Digits2Raw() = default;
-  void readDigits(const std::string& outDir, const std::string& fileDigitsName);
-  void convertDigits(o2::fdd::Digit bcdigits,
-                     gsl::span<const ChannelData> pmchannels,
-                     const o2::fdd::LookUpTable& lut);
-
-  o2::raw::RawFileWriter& getWriter() { return mWriter; }
-  void setFilePerLink(bool v) { mOutputPerLink = v; }
-  bool getFilePerLink() const { return mOutputPerLink; }
-
-  int carryOverMethod(const header::RDHAny* rdh, const gsl::span<char> data,
-                      const char* ptr, int maxSize, int splitID,
-                      std::vector<char>& trailer, std::vector<char>& header) const;
-
- private:
-  static constexpr uint32_t sTcmLink = 2;
-  static constexpr uint16_t sCruId = 0;
-  static constexpr uint32_t sEndPointId = sCruId;
-
-  void makeGBTHeader(EventHeader& eventHeader, int link, o2::InteractionRecord const& mIntRecord);
-  void fillSecondHalfWordAndAddData(int iChannelPerLink, int prevPmLink, const o2::InteractionRecord& ir);
-  RawEventData mRawEventData;
-  o2::fdd::Triggers mTriggers;
-  o2::raw::RawFileWriter mWriter{"FDD"};
-  bool mOutputPerLink = false;
-  /////////////////////////////////////////////////
-
-  ClassDefNV(Digits2Raw, 1);
-};
-
-} // namespace fdd
-} // namespace o2
-#endif
diff --git a/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawDataProcessSpec.h b/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawDataProcessSpec.h
deleted file mode 100644
index 6ed465b6181dd..0000000000000
--- a/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawDataProcessSpec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   RawDataProcessSpec.h
-
-#ifndef O2_FDD_RAWDATAPROCESSSPEC_H
-#define O2_FDD_RAWDATAPROCESSSPEC_H
-
-#include "Framework/CallbackService.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/Lifetime.h"
-#include "Framework/Output.h"
-#include "Framework/WorkflowSpec.h"
-#include "Framework/SerializationMethods.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/Task.h"
-
-#include "FDDRaw/DigitBlockFDD.h"
-#include "DataFormatsFDD/Digit.h"
-#include "DataFormatsFDD/ChannelData.h"
-
-#include <iostream>
-#include <vector>
-#include <gsl/span>
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace fdd
-{
-
-class RawDataProcessSpec : public Task
-{
- public:
-  RawDataProcessSpec(bool dumpEventBlocks) : mDumpEventBlocks(dumpEventBlocks) {}
-  ~RawDataProcessSpec() override = default;
-  void init(InitContext& ic) final;
-  void run(ProcessingContext& pc) final;
-
- private:
-  bool mDumpEventBlocks;
-
-  o2::header::DataOrigin mOrigin = o2::header::gDataOriginFDD;
-};
-
-framework::DataProcessorSpec getFDDRawDataProcessSpec(bool dumpProcessor);
-
-} // namespace fdd
-} // namespace o2
-
-#endif /* O2_FDDDATAPROCESSDPL_H */
diff --git a/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawDataReaderSpec.h b/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawDataReaderSpec.h
deleted file mode 100644
index c3b0349826e98..0000000000000
--- a/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawDataReaderSpec.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   RawDataReaderSpec.h
-
-#ifndef O2_FDD_RAWDATAREADERSPEC_H
-#define O2_FDD_RAWDATAREADERSPEC_H
-
-#include "DataFormatsFDD/LookUpTable.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/Task.h"
-#include "Framework/CallbackService.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/Lifetime.h"
-#include "Framework/Output.h"
-#include "Framework/WorkflowSpec.h"
-#include "Framework/SerializationMethods.h"
-#include "DPLUtils/DPLRawParser.h"
-#include "DetectorsRaw/RDHUtils.h"
-
-#include <iostream>
-#include <vector>
-#include <gsl/span>
-using namespace o2::framework;
-
-namespace o2
-{
-namespace fdd
-{
-template <typename RawReader>
-class RawDataReaderSpec : public Task
-{
- public:
-  RawDataReaderSpec(const RawReader& rawReader) : mRawReader(rawReader) {}
-  RawDataReaderSpec() = default;
-  ~RawDataReaderSpec() override = default;
-  void init(InitContext& ic) final { o2::fdd::SingleLUT::Instance().printFullMap(); }
-  void run(ProcessingContext& pc) final
-  {
-    DPLRawParser parser(pc.inputs());
-    mRawReader.clear();
-    LOG(info) << "FDD RawDataReaderSpec";
-    uint64_t count = 0;
-    for (auto it = parser.begin(), end = parser.end(); it != end; ++it) {
-      //Proccessing each page
-      count++;
-      auto rdhPtr = reinterpret_cast<const o2::header::RDHAny*>(it.raw());
-      gsl::span<const uint8_t> payload(it.data(), it.size());
-      mRawReader.process(payload, o2::raw::RDHUtils::getLinkID(rdhPtr), int(0));
-    }
-    LOG(info) << "Pages: " << count;
-    mRawReader.accumulateDigits();
-    mRawReader.makeSnapshot(pc);
-  }
-  RawReader mRawReader;
-};
-
-template <typename RawReader>
-framework::DataProcessorSpec getFDDRawDataReaderSpec(const RawReader& rawReader)
-{
-  LOG(info) << "DataProcessorSpec initDataProcSpec() for RawReaderFDD";
-  std::vector<OutputSpec> outputSpec;
-  RawReader::prepareOutputSpec(outputSpec);
-  return DataProcessorSpec{
-    "fdd-datareader-dpl",
-    o2::framework::select("TF:FDD/RAWDATA"),
-    outputSpec,
-    adaptFromTask<RawDataReaderSpec<RawReader>>(rawReader),
-    Options{}};
-}
-
-} // namespace fdd
-} // namespace o2
-
-#endif /* O2_FDDDATAREADERDPL_H */
diff --git a/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawWorkflow.h b/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawWorkflow.h
deleted file mode 100644
index 3bbab66d16497..0000000000000
--- a/Detectors/FIT/FDD/workflow/include/FDDWorkflow/RawWorkflow.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef O2_FDD_RAWWORKFLOW_H
-#define O2_FDD_RAWWORKFLOW_H
-
-/// @file   RawWorkflow.h
-
-#include "Framework/WorkflowSpec.h"
-
-namespace o2
-{
-namespace fdd
-{
-framework::WorkflowSpec getFDDRawWorkflow(bool useProcess,
-                                          bool dumpProcessor, bool dumpReader,
-                                          bool disableRootOut);
-} // namespace fdd
-} // namespace o2
-#endif
diff --git a/Detectors/FIT/FDD/workflow/src/RawDataProcessSpec.cxx b/Detectors/FIT/FDD/workflow/src/RawDataProcessSpec.cxx
deleted file mode 100644
index bf18db67672c2..0000000000000
--- a/Detectors/FIT/FDD/workflow/src/RawDataProcessSpec.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   RawDataProcessSpec.cxx
-
-#include "FDDWorkflow/RawDataProcessSpec.h"
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace fdd
-{
-using namespace std;
-void RawDataProcessSpec::init(InitContext& ic)
-{
-}
-
-void RawDataProcessSpec::run(ProcessingContext& pc)
-{
-  LOG(info) << "RawDataProcessSpec running...";
-  auto vecDigits = pc.inputs().get<std::vector<Digit>>("digits");
-  auto vecChannelData = pc.inputs().get<std::vector<ChannelData>>("digch");
-  if (mDumpEventBlocks) {
-    DigitBlockFDD::print(vecDigits, vecChannelData);
-  }
-}
-
-DataProcessorSpec getFDDRawDataProcessSpec(bool dumpProcessor)
-{
-  std::vector<InputSpec> inputSpec;
-  inputSpec.emplace_back("digits", o2::header::gDataOriginFDD, "DIGITSBC", 0, Lifetime::Timeframe);
-  inputSpec.emplace_back("digch", o2::header::gDataOriginFDD, "DIGITSCH", 0, Lifetime::Timeframe);
-  LOG(info) << "DataProcessorSpec getRawDataProcessSpec";
-  return DataProcessorSpec{
-    "fdd-dataprocess-dpl-flp",
-    inputSpec,
-    Outputs{},
-    AlgorithmSpec{adaptFromTask<RawDataProcessSpec>(dumpProcessor)},
-    Options{}};
-}
-
-} // namespace fdd
-} // namespace o2
diff --git a/Detectors/FIT/FDD/workflow/src/RawDataReaderSpec.cxx b/Detectors/FIT/FDD/workflow/src/RawDataReaderSpec.cxx
deleted file mode 100644
index 631655d3038ec..0000000000000
--- a/Detectors/FIT/FDD/workflow/src/RawDataReaderSpec.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   RawDataReaderSpec.cxx
-
-#include "FDDWorkflow/RawDataReaderSpec.h"
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace fdd
-{
-
-} // namespace fdd
-} // namespace o2
diff --git a/Detectors/FIT/FDD/workflow/src/RawWorkflow.cxx b/Detectors/FIT/FDD/workflow/src/RawWorkflow.cxx
deleted file mode 100644
index c9e5c5be0c81d..0000000000000
--- a/Detectors/FIT/FDD/workflow/src/RawWorkflow.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   RawWorkflow.cxx
-
-#include "FDDWorkflow/RawWorkflow.h"
-#include "FDDWorkflow/RawDataProcessSpec.h"
-#include "FDDWorkflow/RawDataReaderSpec.h"
-#include "FDDWorkflow/DigitWriterSpec.h"
-#include "FDDWorkflow/RawReaderFDD.h"
-namespace o2
-{
-namespace fdd
-{
-
-framework::WorkflowSpec getFDDRawWorkflow(bool useProcess,
-                                          bool dumpProcessor, bool dumpReader,
-                                          bool disableRootOut)
-{
-  LOG(info) << "framework::WorkflowSpec getFDDWorkflow";
-  framework::WorkflowSpec specs;
-  specs.emplace_back(o2::fdd::getFDDRawDataReaderSpec(RawReaderFDD{dumpReader}));
-
-  if (useProcess) {
-    specs.emplace_back(o2::fdd::getFDDRawDataProcessSpec(dumpProcessor));
-  }
-  if (!disableRootOut) {
-    specs.emplace_back(o2::fdd::getFDDDigitWriterSpec(false, false));
-  }
-  return specs;
-}
-
-} // namespace fdd
-} // namespace o2
diff --git a/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0DataProcessDPLSpec.h b/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0DataProcessDPLSpec.h
deleted file mode 100644
index 7b7e98d50368e..0000000000000
--- a/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0DataProcessDPLSpec.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   FT0DataProcessDPLSpec.h
-
-#ifndef O2_FT0DATAPROCESSDPLSPEC_H
-#define O2_FT0DATAPROCESSDPLSPEC_H
-
-#include "Framework/CallbackService.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/Lifetime.h"
-#include "Framework/Output.h"
-#include "Framework/WorkflowSpec.h"
-#include "Framework/SerializationMethods.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/Task.h"
-
-#include "FT0Raw/DigitBlockFT0.h"
-#include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFT0/ChannelData.h"
-
-#include <iostream>
-#include <vector>
-#include <gsl/span>
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace ft0
-{
-
-class FT0DataProcessDPLSpec : public Task
-{
- public:
-  FT0DataProcessDPLSpec(bool dumpEventBlocks) : mDumpEventBlocks(dumpEventBlocks) {}
-  ~FT0DataProcessDPLSpec() override = default;
-  void init(InitContext& ic) final;
-  void run(ProcessingContext& pc) final;
-
- private:
-  bool mDumpEventBlocks;
-
-  o2::header::DataOrigin mOrigin = o2::header::gDataOriginFT0;
-};
-
-framework::DataProcessorSpec getFT0DataProcessDPLSpec(bool dumpProcessor);
-
-} // namespace ft0
-} // namespace o2
-
-#endif /* O2_FT0DATAPROCESSDPL_H */
diff --git a/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0DataReaderDPLSpec.h b/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0DataReaderDPLSpec.h
deleted file mode 100644
index 9074f4f7f0f34..0000000000000
--- a/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0DataReaderDPLSpec.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   FT0DataReaderDPLSpec.h
-
-#ifndef O2_FT0DATAREADERDPLSPEC_H
-#define O2_FT0DATAREADERDPLSPEC_H
-#include "DataFormatsFT0/LookUpTable.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/Task.h"
-#include "Framework/CallbackService.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/Lifetime.h"
-#include "Framework/Output.h"
-#include "Framework/WorkflowSpec.h"
-#include "Framework/SerializationMethods.h"
-#include "DPLUtils/DPLRawParser.h"
-#include "Framework/InputRecordWalker.h"
-#include <iostream>
-#include <vector>
-#include <gsl/span>
-#include "CommonUtils/VerbosityConfig.h"
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace ft0
-{
-template <typename RawReader>
-class FT0DataReaderDPLSpec : public Task
-{
- public:
-  FT0DataReaderDPLSpec(const RawReader& rawReader) : mRawReader(rawReader) {}
-  FT0DataReaderDPLSpec() = default;
-  ~FT0DataReaderDPLSpec() override = default;
-  typedef RawReader RawReader_t;
-  void init(InitContext& ic) final { o2::ft0::SingleLUT::Instance().printFullMap(); }
-  void run(ProcessingContext& pc) final
-  {
-    // if we see requested data type input with 0xDEADBEEF subspec and 0 payload this means that the "delayed message"
-    // mechanism created it in absence of real data from upstream. Processor should send empty output to not block the workflow
-    {
-      static size_t contDeadBeef = 0; // number of times 0xDEADBEEF was seen continuously
-      std::vector<InputSpec> dummy{InputSpec{"dummy", ConcreteDataMatcher{o2::header::gDataOriginFT0, o2::header::gDataDescriptionRawData, 0xDEADBEEF}}};
-      for (const auto& ref : InputRecordWalker(pc.inputs(), dummy)) {
-        const auto dh = o2::framework::DataRefUtils::getHeader<o2::header::DataHeader*>(ref);
-        auto payloadSize = DataRefUtils::getPayloadSize(ref);
-        if (payloadSize == 0) {
-          auto maxWarn = o2::conf::VerbosityConfig::Instance().maxWarnDeadBeef;
-          if (++contDeadBeef <= maxWarn) {
-            LOGP(alarm, "Found input [{}/{}/{:#x}] TF#{} 1st_orbit:{} Payload {} : assuming no payload for all links in this TF{}",
-                 dh->dataOrigin.str, dh->dataDescription.str, dh->subSpecification, dh->tfCounter, dh->firstTForbit, payloadSize,
-                 contDeadBeef == maxWarn ? fmt::format(". {} such inputs in row received, stopping reporting", contDeadBeef) : "");
-          }
-          mRawReader.makeSnapshot(pc); // send empty output
-          return;
-        }
-      }
-      contDeadBeef = 0; // if good data, reset the counter
-    }
-    std::vector<InputSpec> filter{InputSpec{"filter", ConcreteDataTypeMatcher{o2::header::gDataOriginFT0, o2::header::gDataDescriptionRawData}, Lifetime::Timeframe}};
-    DPLRawParser parser(pc.inputs(), filter);
-    std::size_t count = 0;
-    for (auto it = parser.begin(), end = parser.end(); it != end; ++it) {
-      //Proccessing each page
-      count++;
-      auto rdhPtr = reinterpret_cast<const o2::header::RDHAny*>(it.raw());
-      gsl::span<const uint8_t> payload(it.data(), it.size());
-      mRawReader.process(payload, o2::raw::RDHUtils::getLinkID(rdhPtr), o2::raw::RDHUtils::getEndPointID(rdhPtr));
-    }
-    LOG(info) << "Pages: " << count;
-    mRawReader.accumulateDigits();
-    mRawReader.makeSnapshot(pc);
-    mRawReader.clear();
-  }
-  RawReader_t mRawReader;
-};
-
-template <typename RawReader>
-framework::DataProcessorSpec getFT0DataReaderDPLSpec(const RawReader& rawReader, bool askSTFDist)
-{
-  LOG(info) << "DataProcessorSpec initDataProcSpec() for RawReaderFT0";
-  std::vector<OutputSpec> outputSpec;
-  RawReader::prepareOutputSpec(outputSpec);
-  std::vector<InputSpec> inputSpec{{"STF", ConcreteDataTypeMatcher{o2::header::gDataOriginFT0, "RAWDATA"}, Lifetime::Timeframe}};
-  if (askSTFDist) {
-    inputSpec.emplace_back("STFDist", "FLP", "DISTSUBTIMEFRAME", 0, Lifetime::Timeframe);
-  }
-  return DataProcessorSpec{
-    "ft0-datareader-dpl",
-    inputSpec,
-    outputSpec,
-    adaptFromTask<FT0DataReaderDPLSpec<RawReader>>(rawReader),
-    Options{}};
-}
-
-} // namespace ft0
-} // namespace o2
-
-#endif /* O2_FT0DATAREADERDPL_H */
diff --git a/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0Workflow.h b/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0Workflow.h
deleted file mode 100644
index a4988b2c18fc7..0000000000000
--- a/Detectors/FIT/FT0/workflow/include/FT0Workflow/FT0Workflow.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef O2_FIT_FT0WORKFLOW_H
-#define O2_FIT_FT0WORKFLOW_H
-
-/// @file   FT0Workflow.h
-
-#include "Framework/WorkflowSpec.h"
-
-namespace o2
-{
-namespace ft0
-{
-framework::WorkflowSpec getFT0Workflow(bool isExtendedMode, bool useProcess,
-                                       bool dumpProcessor, bool dumpReader,
-                                       bool disableRootOut, bool askSTFDist);
-} // namespace ft0
-} // namespace o2
-#endif
diff --git a/Detectors/FIT/FT0/workflow/include/FT0Workflow/RawReaderFT0.h b/Detectors/FIT/FT0/workflow/include/FT0Workflow/RawReaderFT0.h
deleted file mode 100644
index f7729394db652..0000000000000
--- a/Detectors/FIT/FT0/workflow/include/FT0Workflow/RawReaderFT0.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-//
-//file RawReaderFT0.h class  for RAW data reading
-//
-// Artur.Furs
-// afurs@cern.ch
-//
-//Main purpuse is to decode FT0 data blocks and push them to DigitBlockFT0 for proccess
-//TODO: prepare wrappers for containers with digits and combine classes below into one template class?
-#ifndef ALICEO2_FIT_RAWREADERFT0_H_
-#define ALICEO2_FIT_RAWREADERFT0_H_
-#include <iostream>
-#include <vector>
-#include <Rtypes.h>
-#include "FT0Raw/RawReaderFT0Base.h"
-
-#include "DataFormatsFT0/Digit.h"
-#include "DataFormatsFT0/ChannelData.h"
-
-#include "Framework/ProcessingContext.h"
-#include "Framework/DataAllocator.h"
-#include "Framework/OutputSpec.h"
-#include <gsl/span>
-
-namespace o2
-{
-namespace ft0
-{
-//Normal TCM mode
-template <bool useTrgInput = false>
-class RawReaderFT0 : public RawReaderFT0BaseNorm
-{
- public:
-  RawReaderFT0(bool dumpData) : mDumpData(dumpData) {}
-  RawReaderFT0(const RawReaderFT0&) = default;
-
-  RawReaderFT0() = default;
-  ~RawReaderFT0() = default;
-  static constexpr bool sUseTrgInput = useTrgInput;
-  void clear()
-  {
-    mVecDigits.clear();
-    if constexpr (sUseTrgInput) {
-      mVecTriggerInput.clear();
-    }
-    mVecChannelData.clear();
-  }
-  void accumulateDigits()
-  {
-    if constexpr (sUseTrgInput) {
-      getDigits(mVecDigits, mVecChannelData, mVecTriggerInput);
-    } else {
-      getDigits(mVecDigits, mVecChannelData);
-    }
-    LOG(info) << "Number of Digits: " << mVecDigits.size();
-    LOG(info) << "Number of ChannelData: " << mVecChannelData.size();
-    if constexpr (sUseTrgInput) {
-      LOG(info) << "Number of TriggerInput: " << mVecTriggerInput.size();
-    }
-    if (mDumpData) {
-      DigitBlockFT0::print(mVecDigits, mVecChannelData);
-    }
-  }
-  static void prepareOutputSpec(std::vector<o2::framework::OutputSpec>& outputSpec)
-  {
-    outputSpec.emplace_back(o2::header::gDataOriginFT0, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe);
-    outputSpec.emplace_back(o2::header::gDataOriginFT0, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe);
-    if constexpr (sUseTrgInput) {
-      outputSpec.emplace_back(o2::header::gDataOriginFT0, "TRIGGERINPUT", 0, o2::framework::Lifetime::Timeframe);
-    }
-  }
-  void makeSnapshot(o2::framework::ProcessingContext& pc)
-  {
-    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0}, mVecDigits);
-    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0}, mVecChannelData);
-    if constexpr (sUseTrgInput) {
-      pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "TRIGGERINPUT", 0}, mVecTriggerInput);
-    }
-  }
-  bool mDumpData;
-  std::vector<Digit> mVecDigits;
-  std::vector<DetTrigInput> mVecTriggerInput;
-  std::vector<ChannelData> mVecChannelData;
-};
-
-//Extended TCM mode (additional raw data struct)
-template <bool useTrgInput = false>
-class RawReaderFT0ext : public RawReaderFT0BaseExt
-{
- public:
-  RawReaderFT0ext(bool dumpData) : mDumpData(dumpData) {}
-  RawReaderFT0ext(const RawReaderFT0ext&) = default;
-  static constexpr bool sUseTrgInput = useTrgInput;
-  RawReaderFT0ext() = default;
-  ~RawReaderFT0ext() = default;
-  void clear()
-  {
-    mVecDigits.clear();
-    mVecChannelData.clear();
-    mVecTrgExt.clear();
-    if constexpr (sUseTrgInput) {
-      mVecTriggerInput.clear();
-    }
-  }
-  void accumulateDigits()
-  {
-    if constexpr (sUseTrgInput) {
-      getDigits(mVecDigits, mVecChannelData, mVecTrgExt, mVecTriggerInput);
-    } else {
-      getDigits(mVecDigits, mVecChannelData, mVecTrgExt);
-    }
-    LOG(info) << "Number of Digits: " << mVecDigits.size();
-    LOG(info) << "Number of ChannelData: " << mVecChannelData.size();
-    LOG(info) << "Number of TriggerExt: " << mVecTrgExt.size();
-    if (mDumpData) {
-      DigitBlockFT0ext::print(mVecDigits, mVecChannelData, mVecTrgExt);
-    }
-  }
-  static void prepareOutputSpec(std::vector<o2::framework::OutputSpec>& outputSpec)
-  {
-    outputSpec.emplace_back(o2::header::gDataOriginFT0, "DIGITSBC", 0, o2::framework::Lifetime::Timeframe);
-    outputSpec.emplace_back(o2::header::gDataOriginFT0, "DIGITSCH", 0, o2::framework::Lifetime::Timeframe);
-    outputSpec.emplace_back(o2::header::gDataOriginFT0, "DIGITSTRGEXT", 0, o2::framework::Lifetime::Timeframe);
-    if constexpr (sUseTrgInput) {
-      outputSpec.emplace_back(o2::header::gDataOriginFT0, "TRIGGERINPUT", 0, o2::framework::Lifetime::Timeframe);
-    }
-  }
-  void makeSnapshot(o2::framework::ProcessingContext& pc)
-  {
-    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSBC", 0}, mVecDigits);
-    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSCH", 0}, mVecChannelData);
-    pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "DIGITSTRGEXT", 0}, mVecTrgExt);
-    if constexpr (sUseTrgInput) {
-      pc.outputs().snapshot(o2::framework::Output{o2::header::gDataOriginFT0, "TRIGGERINPUT", 0}, mVecTriggerInput);
-    }
-  }
-  bool mDumpData;
-  std::vector<Digit> mVecDigits;
-  std::vector<ChannelData> mVecChannelData;
-  std::vector<TriggersExt> mVecTrgExt;
-  std::vector<DetTrigInput> mVecTriggerInput;
-};
-
-} // namespace ft0
-} // namespace o2
-
-#endif
diff --git a/Detectors/FIT/FT0/workflow/src/FT0DataProcessDPLSpec.cxx b/Detectors/FIT/FT0/workflow/src/FT0DataProcessDPLSpec.cxx
deleted file mode 100644
index d7a7a689d402f..0000000000000
--- a/Detectors/FIT/FT0/workflow/src/FT0DataProcessDPLSpec.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   FT0DataProcessDPLSpec.cxx
-
-#include "FT0Workflow/FT0DataProcessDPLSpec.h"
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace ft0
-{
-using namespace std;
-void FT0DataProcessDPLSpec::init(InitContext& ic)
-{
-}
-
-void FT0DataProcessDPLSpec::run(ProcessingContext& pc)
-{
-  LOG(info) << "FT0DataProcessDPLSpec running...";
-  auto vecDigits = pc.inputs().get<std::vector<Digit>>("digits");
-  auto vecChannelData = pc.inputs().get<std::vector<ChannelData>>("digch");
-  if (mDumpEventBlocks) {
-    DigitBlockFT0::print(vecDigits, vecChannelData);
-  }
-}
-
-DataProcessorSpec getFT0DataProcessDPLSpec(bool dumpProcessor)
-{
-  std::vector<InputSpec> inputSpec;
-  inputSpec.emplace_back("digits", o2::header::gDataOriginFT0, "DIGITSBC", 0, Lifetime::Timeframe);
-  inputSpec.emplace_back("digch", o2::header::gDataOriginFT0, "DIGITSCH", 0, Lifetime::Timeframe);
-  LOG(info) << "DataProcessorSpec getFT0DataProcessDPLSpec";
-  return DataProcessorSpec{
-    "ft0-dataprocess-dpl-flp",
-    inputSpec,
-    Outputs{},
-    AlgorithmSpec{adaptFromTask<FT0DataProcessDPLSpec>(dumpProcessor)},
-    Options{}};
-}
-
-} // namespace ft0
-} // namespace o2
diff --git a/Detectors/FIT/FT0/workflow/src/FT0DataReaderDPLSpec.cxx b/Detectors/FIT/FT0/workflow/src/FT0DataReaderDPLSpec.cxx
deleted file mode 100644
index caa642794b561..0000000000000
--- a/Detectors/FIT/FT0/workflow/src/FT0DataReaderDPLSpec.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   FT0DataReaderDPLSpec.cxx
-
-#include "FT0Workflow/FT0DataReaderDPLSpec.h"
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace ft0
-{
-
-} // namespace ft0
-} // namespace o2
diff --git a/Detectors/FIT/FT0/workflow/src/FT0Workflow.cxx b/Detectors/FIT/FT0/workflow/src/FT0Workflow.cxx
deleted file mode 100644
index 156feb7dd3e2f..0000000000000
--- a/Detectors/FIT/FT0/workflow/src/FT0Workflow.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   FT0Workflow.cxx
-
-#include "FT0Workflow/FT0Workflow.h"
-#include "FT0Workflow/FT0DataProcessDPLSpec.h"
-#include "FT0Workflow/FT0DataReaderDPLSpec.h"
-#include "FT0Workflow/FT0DigitWriterSpec.h"
-#include "FT0Workflow/RawReaderFT0.h"
-namespace o2
-{
-namespace ft0
-{
-
-framework::WorkflowSpec getFT0Workflow(bool isExtendedMode, bool useProcess,
-                                       bool dumpProcessor, bool dumpReader,
-                                       bool disableRootOut, bool askSTFDist)
-{
-  LOG(info) << "framework::WorkflowSpec getFT0Workflow";
-  framework::WorkflowSpec specs;
-  if (isExtendedMode) {
-    specs.emplace_back(o2::ft0::getFT0DataReaderDPLSpec(RawReaderFT0ext{dumpReader}, askSTFDist));
-  } else {
-    specs.emplace_back(o2::ft0::getFT0DataReaderDPLSpec(RawReaderFT0<false>{dumpReader}, askSTFDist));
-  }
-  if (useProcess) {
-    specs.emplace_back(o2::ft0::getFT0DataProcessDPLSpec(dumpProcessor));
-  }
-  if (!disableRootOut) {
-    specs.emplace_back(o2::ft0::getFT0DigitWriterSpec(false, false));
-  }
-  return specs;
-}
-
-} // namespace ft0
-} // namespace o2
diff --git a/Detectors/FIT/FT0/workflow/src/RawReaderFT0.cxx b/Detectors/FIT/FT0/workflow/src/RawReaderFT0.cxx
deleted file mode 100644
index b2ef17e540112..0000000000000
--- a/Detectors/FIT/FT0/workflow/src/RawReaderFT0.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "FT0Workflow/RawReaderFT0.h"
-using namespace o2::ft0;
diff --git a/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowSpec.cxx b/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowSpec.cxx
deleted file mode 100644
index ab4f90464b31b..0000000000000
--- a/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowSpec.cxx
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "TOFWorkflow/RecoWorkflowSpec.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/DataRefUtils.h"
-#include "Framework/Lifetime.h"
-#include "Framework/Task.h"
-#include "Framework/SerializationMethods.h"
-#include "Headers/DataHeader.h"
-#include "DataFormatsTOF/Cluster.h"
-#include "GlobalTracking/MatchTOF.h"
-#include "ReconstructionDataFormats/TrackTPCITS.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GRPGeomHelper.h"
-#include "CommonUtils/NameConf.h"
-#include <gsl/span>
-#include "TStopwatch.h"
-#include "TPCCalibration/VDriftHelper.h"
-
-// from FIT
-#include "DataFormatsFT0/RecPoints.h"
-
-#include <memory> // for make_shared, make_unique, unique_ptr
-#include <vector>
-
-using namespace o2::framework;
-
-namespace o2
-{
-namespace tof
-{
-
-// use the tasking system of DPL
-// just need to implement 2 special methods init + run (there is no need to inherit from anything)
-class TOFDPLRecoWorkflowTask
-{
-  using evIdx = o2::dataformats::EvIndex<int, int>;
-  using MatchOutputType = std::vector<o2::dataformats::MatchInfoTOF>;
-
-  bool mUseMC = true;
-  bool mUseFIT = false;
-
- public:
-  explicit TOFDPLRecoWorkflowTask(std::shared_ptr<o2::base::GRPGeomRequest> gr, bool useMC, bool useFIT) : mGGCCDBRequest(gr), mUseMC(useMC), mUseFIT(useFIT) {}
-
-  void init(framework::InitContext& ic)
-  {
-    o2::base::GRPGeomHelper::instance().setRequest(mGGCCDBRequest);
-    mTimer.Stop();
-    mTimer.Reset();
-  }
-
-  void run(framework::ProcessingContext& pc)
-  {
-    mTimer.Start(false);
-    updateTimeDependentParams(pc);
-    //>>>---------- attach input data --------------->>>
-    const auto clustersRO = pc.inputs().get<gsl::span<o2::tof::Cluster>>("tofcluster");
-    const auto tracksRO = pc.inputs().get<gsl::span<o2::dataformats::TrackTPCITS>>("globaltrack");
-
-    if (mUseFIT) {
-      // Note: the particular variable will go out of scope, but the span is passed by copy to the
-      // worker and the underlying memory is valid throughout the whole computation
-      auto recPoints = std::move(pc.inputs().get<gsl::span<o2::ft0::RecPoints>>("fitrecpoints"));
-      mMatcher.setFITRecPoints(recPoints);
-      LOG(info) << "TOF Reco Workflow pulled " << recPoints.size() << " FIT RecPoints";
-    }
-
-    // we do a copy of the input but we are looking for a way to avoid it (current problem in conversion form unique_ptr to *)
-
-    gsl::span<const o2::MCCompLabel> itstpclab;
-    o2::dataformats::MCTruthContainer<o2::MCCompLabel> toflab;
-    if (mUseMC) {
-      const auto toflabel = pc.inputs().get<o2::dataformats::MCTruthContainer<o2::MCCompLabel>*>("tofclusterlabel");
-      itstpclab = pc.inputs().get<gsl::span<o2::MCCompLabel>>("itstpclabel");
-      toflab = std::move(*toflabel);
-    }
-
-    mMatcher.run(tracksRO, clustersRO, toflab, itstpclab);
-
-    // in run_match_tof aggiugnere esplicitamente la chiamata a fill del tree (nella classe MatchTOF) e il metodo per leggere i vettori di output
-
-    //...
-    // LOG(info) << "TOF CLUSTERER : TRANSFORMED " << digits->size()
-    //           << " DIGITS TO " << mClustersArray.size() << " CLUSTERS";
-
-    // send matching-info
-    pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MTC_ITSTPC", 0}, mMatcher.getMatchedTrackVector());
-    if (mUseMC) {
-      pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "MCMATCHTOF", 0}, mMatcher.getMatchedTOFLabelsVector());
-    }
-    pc.outputs().snapshot(Output{o2::header::gDataOriginTOF, "CALIBDATA", 0}, mMatcher.getCalibVector());
-    mTimer.Stop();
-  }
-
-  void endOfStream(EndOfStreamContext& ec)
-  {
-    LOGF(info, "TOF Matching total timing: Cpu: %.3e Real: %.3e s in %d slots",
-         mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
-  }
-
-  void updateTimeDependentParams(ProcessingContext& pc)
-  {
-    o2::base::GRPGeomHelper::instance().checkUpdates(pc);
-    mTPCVDriftHelper.extractCCDBInputs(pc);
-    static bool initOnceDone = false;
-    if (!initOnceDone) { // this params need to be queried only once
-      initOnceDone = true;
-      // put here init-once stuff
-    }
-    // we may have other params which need to be queried regularly
-    if (mTPCVDriftHelper.isUpdated()) {
-      LOGP(info, "Updating TPC fast transform map with new VDrift factor of {} wrt reference {} from source {}",
-           mTPCVDriftHelper.getVDriftObject().corrFact, mTPCVDriftHelper.getVDriftObject().refVDrift, mTPCVDriftHelper.getSourceName());
-      mMatcher.setTPCVDrift(mTPCVDriftHelper.getVDriftObject());
-      mTPCVDriftHelper.acknowledgeUpdate();
-    }
-  }
-
-  void finaliseCCDB(ConcreteDataMatcher& matcher, void* obj)
-  {
-    if (o2::base::GRPGeomHelper::instance().finaliseCCDB(matcher, obj)) {
-      return;
-    }
-    if (mTPCVDriftHelper.accountCCDBInputs(matcher, obj)) {
-      return;
-    }
-  }
-
- private:
-  o2::globaltracking::MatchTOF mMatcher; ///< Cluster finder
-  std::shared_ptr<o2::base::GRPGeomRequest> mGGCCDBRequest;
-  o2::tpc::VDriftHelper mTPCVDriftHelper{};
-  TStopwatch mTimer;
-};
-
-o2::framework::DataProcessorSpec getTOFRecoWorkflowSpec(bool useMC, bool useFIT)
-{
-  std::vector<InputSpec> inputs;
-  std::vector<OutputSpec> outputs;
-  inputs.emplace_back("tofcluster", o2::header::gDataOriginTOF, "CLUSTERS", 0, Lifetime::Timeframe);
-  inputs.emplace_back("globaltrack", "GLO", "TPCITS", 0, Lifetime::Timeframe);
-  if (useMC) {
-    inputs.emplace_back("tofclusterlabel", o2::header::gDataOriginTOF, "CLUSTERSMCTR", 0, Lifetime::Timeframe);
-    inputs.emplace_back("itstpclabel", "GLO", "TPCITS_MC", 0, Lifetime::Timeframe);
-  }
-
-  if (useFIT) {
-    inputs.emplace_back("fitrecpoints", o2::header::gDataOriginFT0, "RECPOINTS", 0, Lifetime::Timeframe);
-  }
-  auto ggRequest = std::make_shared<o2::base::GRPGeomRequest>(false,                             // orbitResetTime
-                                                              true,                              // GRPECS=true
-                                                              false,                             // GRPLHCIF
-                                                              true,                              // GRPMagField
-                                                              true,                              // askMatLUT
-                                                              o2::base::GRPGeomRequest::Aligned, // geometry
-                                                              inputs,
-                                                              true);
-  o2::tpc::VDriftHelper::requestCCDBInputs(inputs);
-
-  outputs.emplace_back(o2::header::gDataOriginTOF, "MTC_ITSTPC", 0, Lifetime::Timeframe);
-  if (useMC) {
-    outputs.emplace_back(o2::header::gDataOriginTOF, "MCMATCHTOF", 0, Lifetime::Timeframe);
-  }
-  outputs.emplace_back(o2::header::gDataOriginTOF, "CALIBDATA", 0, Lifetime::Timeframe);
-
-  return DataProcessorSpec{
-    "TOFRecoWorkflow",
-    inputs,
-    outputs,
-    AlgorithmSpec{adaptFromTask<TOFDPLRecoWorkflowTask>(ggRequest, useMC, useFIT)},
-    Options{
-      {"material-lut-path", VariantType::String, "", {"Path of the material LUT file"}}}};
-}
-
-} // end namespace tof
-} // end namespace o2
diff --git a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecodeRawFile.h b/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecodeRawFile.h
deleted file mode 100644
index e92e8375ad0d0..0000000000000
--- a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecodeRawFile.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file   HmpidDecodeRawFile.h
-/// \author Antonio Franco - INFN Bari
-/// \brief Derived Class for decoding Raw Data File stream
-/// \version 1.0
-/// \date 24 set 2020
-
-#ifndef COMMON_HMPIDDECODERAWFILE_H_
-#define COMMON_HMPIDDECODERAWFILE_H_
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "HMPIDReconstruction/HmpidDecoder.h"
-
-#define MAXFILENAMEBUFFER 512
-#define MAXRAWFILEBUFFER RAWBLOCKDIMENSION_W * 4 + 8
-
-namespace o2
-{
-namespace hmpid
-{
-
-class HmpidDecodeRawFile : public HmpidDecoder
-{
- public:
-  HmpidDecodeRawFile(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments);
-  HmpidDecodeRawFile(int numOfEquipments);
-  ~HmpidDecodeRawFile();
-
-  bool setUpStream(void* InpuFileName, long Size);
-
- private:
-  bool getBlockFromStream(uint32_t** streamPtr, uint32_t Size);
-  bool getHeaderFromStream(uint32_t** streamPtr);
-  bool getWordFromStream(uint32_t* word);
-  int fileExists(char* filewithpath);
-  void setPad(HmpidEquipment* eq, int col, int dil, int ch, uint16_t charge);
-
- private:
-  FILE* fh;
-  char mInputFile[MAXFILENAMEBUFFER];
-  uint32_t mFileBuffer[MAXRAWFILEBUFFER];
-};
-
-} // namespace hmpid
-} // namespace o2
-#endif /* COMMON_HMPIDDECODERAWFILE_H_ */
diff --git a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecodeRawMem.h b/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecodeRawMem.h
deleted file mode 100644
index d5d82d0f238e9..0000000000000
--- a/Detectors/HMPID/reconstruction/include/HMPIDReconstruction/HmpidDecodeRawMem.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file   HmpidDecodeRawMem.h
-/// \author Antonio Franco - INFN Bari
-/// \brief Derived Class for decoding Raw Data Memory stream
-/// \version 1.0
-/// \date 24 set 2020
-
-#ifndef COMMON_HMPIDDECODERAWMEM_H_
-#define COMMON_HMPIDDECODERAWMEM_H_
-
-#include <cctype>
-#include <cstdio>
-#include <cstdlib>
-#include <unistd.h>
-#include <cstring>
-#include <vector>
-
-#include "DataFormatsHMP/Digit.h"
-#include "HMPIDBase/Geo.h"
-#include "HMPIDReconstruction/HmpidDecoder.h"
-
-using namespace o2;
-
-namespace o2
-{
-namespace hmpid
-{
-
-class HmpidDecodeRawMem : public HmpidDecoder
-{
- public:
-  HmpidDecodeRawMem(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments);
-  HmpidDecodeRawMem(int numOfEquipments);
-  ~HmpidDecodeRawMem();
-
-  bool setUpStream(void* Buffer, long BufferLen) override;
-
- private:
-  bool getBlockFromStream(uint32_t** streamPtr, uint32_t Size) override;
-  bool getHeaderFromStream(uint32_t** streamPtr) override;
-  bool getWordFromStream(uint32_t* word) override;
-  void setPad(HmpidEquipment* eq, int col, int dil, int ch, uint16_t charge) override;
-
- private:
-};
-
-class HmpidDecodeRawDigit : public HmpidDecodeRawMem
-{
- public:
-  HmpidDecodeRawDigit(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments);
-  HmpidDecodeRawDigit(int numOfEquipments);
-  ~HmpidDecodeRawDigit();
-
-  std::vector<o2::hmpid::Digit> mDigits;
-
- private:
-  void setPad(HmpidEquipment* eq, int col, int dil, int ch, uint16_t charge) override;
-};
-
-} // namespace hmpid
-} // namespace o2
-#endif /* COMMON_HMPIDDECODERAWFILE_H_ */
diff --git a/Detectors/HMPID/reconstruction/src/HmpidDecodeRawFile.cxx b/Detectors/HMPID/reconstruction/src/HmpidDecodeRawFile.cxx
deleted file mode 100644
index df97a4d2101e0..0000000000000
--- a/Detectors/HMPID/reconstruction/src/HmpidDecodeRawFile.cxx
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file   HmpidDecodeRawFile.cxx
-/// \author Antonio Franco - INFN Bari
-/// \brief Derived Class for decoding Raw Data File stream
-/// \version 1.0
-/// \date 24 set 2020
-
-/* ------ HISTORY ---------
-*/
-#include <fairlogger/Logger.h> // for LOG
-#include "Framework/Logger.h"
-
-#include "HMPIDReconstruction/HmpidDecodeRawFile.h"
-
-using namespace o2::hmpid;
-
-/// Constructor with the default HMPID equipments map at P2
-/// @param[in] numOfEquipments : number of defined equipments [0..13]
-HmpidDecodeRawFile::HmpidDecodeRawFile(int numOfEquipments)
-  : HmpidDecoder(numOfEquipments)
-{
-  fh = 0;
-}
-
-/// Constructor with the HMPID address map
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-/// @param[in] *EqIds : the pointer to the Equipments ID array
-/// @param[in] *CruIds : the pointer to the CRU ID array
-/// @param[in] *LinkIds : the pointer to the Link ID array
-HmpidDecodeRawFile::HmpidDecodeRawFile(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments)
-  : HmpidDecoder(EqIds, CruIds, LinkIds, numOfEquipments)
-{
-  fh = 0;
-}
-
-/// Destructor
-HmpidDecodeRawFile::~HmpidDecodeRawFile()
-{
-}
-
-/// Setup the Input Stream with a File Handle
-/// verify the existence and try to open it
-/// @param[in] *FileName : the string that contains the File Name
-/// @param[in] Size : not used
-/// @returns True if the file is opened
-/// @throws TH_FILENOTEXISTS Thrown if the file doesn't exists
-/// @throws TH_OPENFILE Thrown if Fails to open the file
-bool HmpidDecodeRawFile::setUpStream(void* FileName, long Size)
-{
-  strcpy(mInputFile, (const char*)FileName);
-  // files section ----
-  if (!fileExists(mInputFile)) {
-    LOG(error) << "The input file " << mInputFile << " does not exist at this time.";
-    throw TH_FILENOTEXISTS;
-  }
-  // open the file
-  fh = fopen(mInputFile, "rb");
-  if (fh == 0) {
-    LOG(error) << "ERROR to open Input file ! [" << mInputFile << "]";
-    throw TH_OPENFILE;
-  }
-
-  mActualStreamPtr = 0; // sets the pointer to the Buffer
-  mEndStreamPtr = 0;    //sets the End of buffer
-  mStartStreamPtr = 0;
-
-  return (true);
-}
-
-/// Gets a sized chunk from the stream. Read from the file and update the pointers
-/// ATTENTION : in order to optimize the disk accesses the block read pre-load a
-/// complete Header+Payload block, the Size parameter is recalculated with the
-/// dimension of the pack extract from the header field 'Offeset'
-///
-/// verify the existence and try to open it
-/// @param[in] **streamPtr : the pointer to the memory buffer
-/// @param[in] Size : not used
-/// @returns True if the file is opened
-/// @throws TH_WRONGFILELEN Thrown if the file doesn't contains enough words
-bool HmpidDecodeRawFile::getBlockFromStream(uint32_t** streamPtr, uint32_t Size)
-{
-  if (Size > MAXRAWFILEBUFFER)
-    return (false);
-  int nr = fread(mFileBuffer, sizeof(int32_t), HEADERDIMENSION_W, fh);
-  if (nr != HEADERDIMENSION_W) {
-    throw TH_WRONGFILELEN;
-  }
-  Size = ((mFileBuffer[2] & 0x0000FFFF) / sizeof(int32_t)) - HEADERDIMENSION_W;
-  nr = fread(mFileBuffer + HEADERDIMENSION_W, sizeof(int32_t), Size, fh);
-  LOG(debug) << " getBlockFromStream read " << nr << " of " << Size + HEADERDIMENSION_W << " words !";
-  if (nr != Size) {
-    throw TH_WRONGFILELEN;
-  }
-  *streamPtr = mFileBuffer;
-  mStartStreamPtr = mFileBuffer;
-  mActualStreamPtr = mFileBuffer;
-  mEndStreamPtr = mFileBuffer + Size;
-  return (true);
-}
-
-/// Reads the Header from the file
-/// @param[in] **streamPtr : the pointer to the memory buffer
-/// @returns True if the header is read
-bool HmpidDecodeRawFile::getHeaderFromStream(uint32_t** streamPtr)
-{
-  bool flag = getBlockFromStream(streamPtr, RAWBLOCKDIMENSION_W); // reads the 8k block
-  mActualStreamPtr += HEADERDIMENSION_W;                          // Move forward for the first word
-  return (flag);
-}
-
-/// Read one word from the pre-load buffer
-/// @param[in] *word : the buffer for the read word
-/// @returns True every time
-bool HmpidDecodeRawFile::getWordFromStream(uint32_t* word)
-{
-  *word = *mActualStreamPtr;
-  mActualStreamPtr++;
-  return (true);
-}
-
-/// -----   Sets the Pad ! ------
-/// this is an overloaded method. In this version the value of the charge
-/// is used to update the statistical matrix of the base class
-///
-/// @param[in] *eq : the pointer to the Equipment object
-/// @param[in] col : the column [0..23]
-/// @param[in] dil : the dilogic [0..9]
-/// @param[in] ch : the channel [0..47]
-/// @param[in] charge : the value of the charge
-void HmpidDecodeRawFile::setPad(HmpidEquipment* eq, int col, int dil, int ch, uint16_t charge)
-{
-  eq->setPad(col, dil, ch, charge);
-  return;
-}
-
-/// Checks if the file exists !
-/// @param[in] *filewithpath : the File Name to check
-/// @returns True if the file exists
-int HmpidDecodeRawFile::fileExists(char* filewithpath)
-{
-  if (access(filewithpath, F_OK) != -1) {
-    return (true);
-  } else {
-    return (false);
-  }
-}
-o2::hmpid::Digit
diff --git a/Detectors/HMPID/reconstruction/src/HmpidDecodeRawMem.cxx b/Detectors/HMPID/reconstruction/src/HmpidDecodeRawMem.cxx
deleted file mode 100644
index 5a4f2acbfd97b..0000000000000
--- a/Detectors/HMPID/reconstruction/src/HmpidDecodeRawMem.cxx
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file   HmpidDecodeRawMem.cxx
-/// \author Antonio Franco - INFN Bari
-/// \brief Derived Class for decoding Raw Data Memory stream
-/// \version 1.0
-/// \date 24 set 2020
-
-/* ------ HISTORY ---------
-*/
-#include <fairlogger/Logger.h> // for LOG
-#include "Framework/Logger.h"
-
-#include "DataFormatsHMP/Digit.h"
-#include "HMPIDBase/Geo.h"
-#include "HMPIDReconstruction/HmpidDecodeRawMem.h"
-
-using namespace o2::hmpid;
-
-/// Constructor : accepts the number of equipments to define
-///               The mapping is the default at P2
-///               Allocates instances for all defined equipments
-///               normally it is equal to 14
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-HmpidDecodeRawMem::HmpidDecodeRawMem(int numOfEquipments)
-  : HmpidDecoder(numOfEquipments)
-{
-}
-
-/// Constructor : accepts the number of equipments to define
-///               and their complete address map
-///               Allocates instances for all defined equipments
-///
-///  The Address map is build from three array
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-/// @param[in] *EqIds : the pointer to the Equipments ID array
-/// @param[in] *CruIds : the pointer to the CRU ID array
-/// @param[in] *LinkIds : the pointer to the Link ID array
-HmpidDecodeRawMem::HmpidDecodeRawMem(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments)
-  : HmpidDecoder(EqIds, CruIds, LinkIds, numOfEquipments)
-{
-}
-
-/// Destructor
-HmpidDecodeRawMem::~HmpidDecodeRawMem() = default;
-
-/// Setup the Input Stream with a Memory Pointer
-/// the buffer length is in byte, some controls are done
-///
-/// @param[in] *Buffer : the pointer to Memory buffer
-/// @param[in] BufferLen : the length of the buffer (bytes)
-/// @returns True if the stream is set
-/// @throws TH_NULLBUFFERPOINTER Thrown if the pointer to the buffer is NULL
-/// @throws TH_BUFFEREMPTY Thrown if the buffer is empty
-/// @throws TH_WRONGBUFFERDIM Thrown if the buffer len is less then one header
-bool HmpidDecodeRawMem::setUpStream(void* Buffer, long BufferLen)
-{
-  long wordsBufferLen = BufferLen / (sizeof(int32_t) / sizeof(char)); // Converts the len in words
-  if (Buffer == nullptr) {
-    LOG(error) << "Raw data buffer null Pointer ! ";
-    throw TH_NULLBUFFERPOINTER;
-  }
-  if (wordsBufferLen == 0) {
-    LOG(error) << "Raw data buffer Empty ! ";
-    throw TH_BUFFEREMPTY;
-  }
-  if (wordsBufferLen < 16) {
-    LOG(error) << "Raw data buffer less then the Header Dimension = " << wordsBufferLen;
-    throw TH_WRONGBUFFERDIM;
-  }
-
-  mActualStreamPtr = (uint32_t*)Buffer;                 // sets the pointer to the Buffer
-  mEndStreamPtr = ((uint32_t*)Buffer) + wordsBufferLen; //sets the End of buffer
-  mStartStreamPtr = ((uint32_t*)Buffer);
-  //  std::cout << " setUpStrem : StPtr=" << mStartStreamPtr << " EndPtr=" << mEndStreamPtr << " Len=" << wordsBufferLen << std::endl;
-  return (true);
-}
-
-/// Gets a sized chunk from the stream. The stream pointers members are updated
-/// @param[in] **streamPtr : the pointer to the memory buffer
-/// @param[in] Size : the dimension of the chunk (words)
-/// @returns True every time
-/// @throw TH_WRONGBUFFERDIM Buffer length shorter then the requested
-bool HmpidDecodeRawMem::getBlockFromStream(uint32_t** streamPtr, uint32_t Size)
-{
-  *streamPtr = mActualStreamPtr;
-  mActualStreamPtr += Size;
-  if (mActualStreamPtr > mEndStreamPtr) {
-    //    std::cout << " getBlockFromStream : StPtr=" << mActualStreamPtr << " EndPtr=" << mEndStreamPtr << " Len=" << Size << std::endl;
-    //    std::cout << "Beccato " << std::endl;
-    //    throw TH_WRONGBUFFERDIM;
-    return (false);
-  }
-  return (true);
-}
-
-/// Gets the Header Block from the stream.
-/// @param[in] **streamPtr : the pointer to the memory buffer
-/// @returns True if the header is read
-bool HmpidDecodeRawMem::getHeaderFromStream(uint32_t** streamPtr)
-{
-  return (getBlockFromStream(streamPtr, mRDHSize));
-}
-
-/// Gets a Word from the stream.
-/// @param[in] *word : the buffer for the read word
-/// @returns True if the operation end well
-bool HmpidDecodeRawMem::getWordFromStream(uint32_t* word)
-{
-  uint32_t* appo;
-  *word = *mActualStreamPtr;
-  return (getBlockFromStream(&appo, 1));
-}
-
-/// -----   Sets the Pad ! ------
-/// this is an overloaded method. In this version the value of the charge
-/// is used to update the statistical matrix of the base class
-///
-/// @param[in] *eq : the pointer to the Equipment object
-/// @param[in] col : the column [0..23]
-/// @param[in] dil : the dilogic [0..9]
-/// @param[in] ch : the channel [0..47]
-/// @param[in] charge : the value of the charge
-void HmpidDecodeRawMem::setPad(HmpidEquipment* eq, int col, int dil, int ch, uint16_t charge)
-{
-  eq->setPad(col, dil, ch, charge);
-  return;
-}
-
-// ========================================================================================
-
-/// Constructor : accepts the number of equipments to define
-///               The mapping is the default at P2
-///               Allocates instances for all defined equipments
-///               normally it is equal to 14
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-HmpidDecodeRawDigit::HmpidDecodeRawDigit(int numOfEquipments)
-  : HmpidDecodeRawMem(numOfEquipments)
-{
-}
-
-/// Constructor : accepts the number of equipments to define
-///               and their complete address map
-///               Allocates instances for all defined equipments
-///
-///  The Address map is build from three array
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-/// @param[in] *EqIds : the pointer to the Equipments ID array
-/// @param[in] *CruIds : the pointer to the CRU ID array
-/// @param[in] *LinkIds : the pointer to the Link ID array
-HmpidDecodeRawDigit::HmpidDecodeRawDigit(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments)
-  : HmpidDecodeRawMem(EqIds, CruIds, LinkIds, numOfEquipments)
-{
-}
-
-/// Destructor
-HmpidDecodeRawDigit::~HmpidDecodeRawDigit() = default;
-
-/// -----   Sets the Pad ! ------
-/// this is an overloaded method. In this version the value of the charge
-/// is used to update the statistical matrix of the base class
-///
-/// @param[in] *eq : the pointer to the Equipment object
-/// @param[in] col : the column [0..23]
-/// @param[in] dil : the dilogic [0..9]
-/// @param[in] ch : the channel [0..47]
-/// @param[in] charge : the value of the charge
-void HmpidDecodeRawDigit::setPad(HmpidEquipment* eq, int col, int dil, int ch, uint16_t charge)
-{
-  eq->setPad(col, dil, ch, charge);
-  mDigits.push_back(o2::hmpid::Digit(charge, eq->getEquipmentId(), col, dil, ch));
-  //std::cout << "DI " << mDigits.back() << " "<<col<<","<< dil<<","<< ch<<"="<< charge<<std::endl;
-  return;
-}
diff --git a/Detectors/HMPID/reconstruction/src/HmpidDecoder.cxx b/Detectors/HMPID/reconstruction/src/HmpidDecoder.cxx
deleted file mode 100644
index 6397d707d1b48..0000000000000
--- a/Detectors/HMPID/reconstruction/src/HmpidDecoder.cxx
+++ /dev/null
@@ -1,1134 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file   HmpidDecoder.cxx
-/// \author Antonio Franco - INFN Bari
-/// \brief Base Class to decode HMPID Raw Data stream
-/// \version 1.1
-/// \date 17/11/2020
-
-/* ------ HISTORY ---------
-*/
-
-#include <fairlogger/Logger.h> // for LOG
-#include "Framework/Logger.h"
-#include "Headers/RAWDataHeader.h"
-#include "HMPIDReconstruction/HmpidDecoder.h"
-#include "DataFormatsHMP/Digit.h"
-
-using namespace o2::hmpid;
-
-// ============= HmpidDecoder Class implementation =======
-
-/// Decoding Error Messages Definitions
-char HmpidDecoder::sErrorDescription[MAXERRORS][MAXDESCRIPTIONLENGHT] = {"Word that I don't known !",
-                                                                         "Row Marker Word with 0 words", "Duplicated Pad Word !", "Row Marker Wrong/Lost -> to EoE",
-                                                                         "Row Marker Wrong/Lost -> to EoE", "Row Marker reports an ERROR !", "Lost EoE Marker !", "Double EoE marker",
-                                                                         "Wrong size definition in EoE Marker", "Double Mark Word", "Wrong Size in Segment Marker", "Lost EoS Marker !",
-                                                                         "HMPID Header Errors"};
-
-/// HMPID Firmware Error Messages Definitions
-char HmpidDecoder::sHmpidErrorDescription[MAXHMPIDERRORS][MAXDESCRIPTIONLENGHT] = {
-  "L0 Missing,"
-  "L1 is received without L0",
-  "L1A signal arrived before the L1 Latency", "L1A signal arrived after the L1 Latency",
-  "L1A is missing or L1 timeout", "L1A Message is missing or L1 Message"};
-
-/// Constructor : accepts the number of equipments to define
-///               The mapping is the default at P2
-///               Allocates instances for all defined equipments
-///               normally it is equal to 14
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-HmpidDecoder::HmpidDecoder(int numOfEquipments)
-{
-  // The standard definition of HMPID equipments at P2
-  int EqIds[] = {0, 1, 2, 3, 4, 5, 8, 9, 6, 7, 10, 11, 12, 13};
-  int CruIds[] = {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3, 3};
-  int LinkIds[] = {0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 0, 1, 2};
-
-  mNumberOfEquipments = numOfEquipments;
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    mTheEquipments[i] = new HmpidEquipment(EqIds[i], CruIds[i], LinkIds[i]);
-  }
-}
-
-/// Constructor : accepts the number of equipments to define
-///               and their complete address map
-///               Allocates instances for all defined equipments
-///
-///  The Address map is build from three array
-/// @param[in] numOfEquipments : the number of equipments to define [1..14]
-/// @param[in] *EqIds : the pointer to the Equipments ID array
-/// @param[in] *CruIds : the pointer to the CRU ID array
-/// @param[in] *LinkIds : the pointer to the Link ID array
-HmpidDecoder::HmpidDecoder(int* EqIds, int* CruIds, int* LinkIds, int numOfEquipments)
-{
-  mNumberOfEquipments = numOfEquipments;
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    mTheEquipments[i] = new HmpidEquipment(EqIds[i], CruIds[i], LinkIds[i]);
-  }
-}
-
-/// Destructor : remove the Equipments instances
-HmpidDecoder::~HmpidDecoder()
-{
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    delete mTheEquipments[i];
-  }
-}
-
-/// Init all the members variables.
-void HmpidDecoder::init()
-{
-  mRDHSize = sizeof(o2::header::RAWDataHeader) / sizeof(uint32_t);
-
-  mVerbose = 0;
-  mHeEvent = 0;
-  mHeBusy = 0;
-  mNumberWordToRead = 0;
-  mPayloadTail = 0;
-
-  mHeFEEID = 0;
-  mHeSize = 0;
-  mHeVer = 0;
-  mHePrior = 0;
-  mHeStop = 0;
-  mHePages = 0;
-  mEquipment = 0;
-
-  mHeOffsetNewPack = 0;
-  mHeMemorySize = 0;
-
-  mHeDetectorID = 0;
-  mHeDW = 0;
-  mHeCruID = 0;
-  mHePackNum = 0;
-  mHePAR = 0;
-  mHePageNum = 0;
-  mHeLinkNum = 0;
-  mHeFirmwareVersion = 0;
-  mHeHmpidError = 0;
-  mHeBCDI = 0;
-  mHeORBIT = 0;
-  mHeTType = 0;
-
-  mActualStreamPtr = nullptr;
-  mEndStreamPtr = nullptr;
-  mStartStreamPtr = nullptr;
-
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    mTheEquipments[i]->init();
-  }
-}
-
-/// Returns the Equipment Index (Pointer of the array) converting
-/// the FLP hardware coords (CRU_Id and Link_Id)
-/// @param[in] CruId : the CRU ID [0..3] -> FLP 160 = [0,1]  FLP 161 = [2,3]
-/// @param[in] LinkId : the Link ID [0..3]
-/// @returns EquipmentIndex : the index in the Equipment array [0..13] (-1 := error)
-int HmpidDecoder::getEquipmentIndex(int CruId, int LinkId)
-{
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    if (mTheEquipments[i]->getEquipmentId(CruId, LinkId) != -1) {
-      return (i);
-    }
-  }
-  return (-1);
-}
-
-/// Returns the Equipment Index (Pointer of the array) converting
-/// the Equipment_ID (Firmaware defined Id AKA FFEID)
-/// @param[in] EquipmentId : the Equipment ID [0..13]
-/// @returns EquipmentIndex : the index in the Equipment array [0..13] (-1 := error)
-int HmpidDecoder::getEquipmentIndex(int EquipmentId)
-{
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    if (mTheEquipments[i]->getEquipmentId() == EquipmentId) {
-      return (i);
-    }
-  }
-  return (-1);
-}
-
-/// Returns the Equipment_ID converting the FLP hardware coords
-/// @param[in] CruId : the CRU ID [0..3] -> FLP 160 = [0,1]  FLP 161 = [2,3]
-/// @param[in] LinkId : the Link ID [0..3]
-/// @returns EquipmentID : the ID of the Equipment [0..13] (-1 := error)
-int HmpidDecoder::getEquipmentID(int CruId, int LinkId)
-{
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    if (mTheEquipments[i]->getEquipmentId(CruId, LinkId) != -1) {
-      return (mTheEquipments[i]->getEquipmentId());
-    }
-  }
-  return (-1);
-}
-
-/// Scans the BitMap of Raw Data File word and detect the type
-/// and the parameters
-/// @param[in] wp : the word to analyze
-/// @param[out] *p1 : first parameter extract (if it exists)
-/// @param[out] *p2 : second parameter extract (if it exists)
-/// @param[out] *p3 : third parameter extract (if it exists)
-/// @param[out] *p4 : fourth parameter extract (if it exists)
-/// @returns Type of Word : the type of word [0..4] (0 := undetect)
-int HmpidDecoder::checkType(uint32_t wp, int* p1, int* p2, int* p3, int* p4)
-{
-  if ((wp & 0x0000ffff) == 0x000036A8 || (wp & 0x0000ffff) == 0x000032A8 || (wp & 0x0000ffff) == 0x000030A0 || (wp & 0x0800ffff) == 0x080010A0) {
-    *p2 = (wp & 0x03ff0000) >> 16; // Number of words of row
-    *p1 = wp & 0x0000ffff;
-    return (WTYPE_ROW);
-  }
-  if ((wp & 0xfff00000) >> 20 == 0xAB0) {
-    *p2 = (wp & 0x000fff00) >> 8; // Number of words of Segment
-    *p1 = (wp & 0xfff00000) >> 20;
-    *p3 = wp & 0x0000000F;
-    if (*p3 < 4 && *p3 > 0) {
-      return (WTYPE_EOS);
-    }
-  }
-  // #EX MASK Raul 0x3803FF80  # ex mask 0xF803FF80 - this is EoE marker 0586800B0
-  if ((wp & 0x0803FF80) == 0x08000080) {
-    *p1 = (wp & 0x07c00000) >> 22;
-    *p2 = (wp & 0x003C0000) >> 18;
-    *p3 = (wp & 0x0000007F);
-    if (*p1 < 25 && *p2 < 11) {
-      return (WTYPE_EOE);
-    }
-  }
-  if ((wp & 0x08000000) == 0) { //  # this is a pad
-    // PAD:0000.0ccc.ccdd.ddnn.nnnn.vvvv.vvvv.vvvv :: c=col,d=dilo,n=chan,v=value
-    *p1 = (wp & 0x07c00000) >> 22;
-    *p2 = (wp & 0x003C0000) >> 18;
-    *p3 = (wp & 0x0003F000) >> 12;
-    *p4 = (wp & 0x00000FFF);
-    if (*p1 > 0 && *p1 < 25 && *p2 > 0 && *p2 < 11 && *p3 < 48) {
-      return (WTYPE_PAD);
-    }
-  } else {
-    return (WTYPE_NONE);
-  }
-  return (WTYPE_NONE);
-}
-
-/// Checks if is a Raw Marker and extract the Row Size
-/// @param[in] wp : the word to check
-/// @param[out] *Err : true if an error is detected
-/// @param[out] *rowSize : the number of words of the row
-/// @param[out] *mark : the row marker
-/// @returns True if Row Marker is detected
-bool HmpidDecoder::isRowMarker(uint32_t wp, int* Err, int* rowSize, int* mark)
-{
-  if ((wp & 0x0000ffff) == 0x36A8 || (wp & 0x0000ffff) == 0x32A8 || (wp & 0x0000ffff) == 0x30A0 || (wp & 0x0800ffff) == 0x080010A0) {
-    *rowSize = (wp & 0x03ff0000) >> 16; // # Number of words of row
-    *mark = wp & 0x0000ffff;
-    *Err = false;
-    return (true);
-  } else {
-    *Err = true;
-    return (false);
-  }
-}
-
-/// Checks if is a Segment Marker and extracts the Segment number and the size
-/// @param[in] wp : the word to check
-/// @param[out] *Err : true if an error is detected
-/// @param[out] *segSize : the number of words of the segment
-/// @param[out] *Seg : the Segment number [1..3]
-/// @param[out] *mark : the Segment Marker
-/// @returns True if Segment Marker is detected
-bool HmpidDecoder::isSegmentMarker(uint32_t wp, int* Err, int* segSize, int* Seg, int* mark)
-{
-  *Err = false;
-  if ((wp & 0xfff00000) >> 20 == 0xAB0) {
-    *segSize = (wp & 0x000fff00) >> 8; // # Number of words of Segment
-    *mark = (wp & 0xfff00000) >> 20;
-    *Seg = wp & 0x0000000F;
-    if (*Seg > 3 || *Seg < 1) {
-      LOG(info) << " Wrong segment Marker Word, bad Number of segment" << *Seg << "!";
-      *Err = true;
-    }
-    return (true);
-  } else {
-    return (false);
-  }
-}
-
-/// Checks if is a PAD Word and extracts all the parameters
-/// PAD map : 0000.0ccc.ccdd.ddnn.nnnn.vvvv.vvvv.vvvv :: c=col,d=dilo,n=chan,v=value
-/// @param[in] wp : the word to check
-/// @param[out] *Err : true if an error is detected
-/// @param[out] *Col : the column number [1..24]
-/// @param[out] *Dilogic : the dilogic number [1..10]
-/// @param[out] *Channel : the channel number [0..47]
-/// @param[out] *Charge : the value of Charge [0..4095]
-/// @returns True if PAD Word is detected
-bool HmpidDecoder::isPadWord(uint32_t wp, int* Err, int* Col, int* Dilogic, int* Channel, int* Charge)
-{
-  *Err = false;
-  //  if ((wp & 0x08000000) != 0) {
-  if ((wp & 0x08000000) != 0) {
-    return (false);
-  }
-  *Col = (wp & 0x07c00000) >> 22;
-  *Dilogic = (wp & 0x003C0000) >> 18;
-  *Channel = (wp & 0x0003F000) >> 12;
-  *Charge = (wp & 0x00000FFF);
-
-  if ((wp & 0x0ffff) == 0x036A8 || (wp & 0x0ffff) == 0x032A8 || (wp & 0x0ffff) == 0x030A0 || (wp & 0x0ffff) == 0x010A0) { //  # ! this is a pad
-    if (*Dilogic > 10 || *Channel > 47 || *Dilogic < 1 || *Col > 24 || *Col < 1) {
-      return (false);
-    }
-  } else {
-    if (*Dilogic > 10 || *Channel > 47 || *Dilogic < 1 || *Col > 24 || *Col < 1) {
-      //    LOG(warning) << " Wrong Pad values Col=" << *Col << " Dilogic=" << *Dilogic << " Channel=" << *Channel << " Charge=" << *Charge << " wp:0x" << std::hex << wp << std::dec;
-      *Err = true;
-      return (false);
-    }
-  }
-  return (true);
-}
-
-/// Checks if is a EoE Marker and extracts the Column, Dilogic and the size
-/// @param[in] wp : the word to check
-/// @param[out] *Err : true if an error is detected
-/// @param[out] *Col : the column number [1..24]
-/// @param[out] *Dilogic : the dilogic number [1..10]
-/// @param[out] *Eoesize : the number of words for dilogic
-/// @returns True if EoE marker is detected
-bool HmpidDecoder::isEoEmarker(uint32_t wp, int* Err, int* Col, int* Dilogic, int* Eoesize)
-{
-  *Err = false;
-  // #EX MASK Raul 0x3803FF80  # ex mask 0xF803FF80 - this is EoE marker 0586800B0
-  if ((wp & 0x0803FF80) == 0x08000080) {
-    *Col = (wp & 0x07c00000) >> 22;
-    *Dilogic = (wp & 0x003C0000) >> 18;
-    *Eoesize = (wp & 0x0000007F);
-    if (*Col > 24 || *Dilogic > 10) {
-      LOG(info) << " EoE size wrong definition. Col=" << *Col << " Dilogic=" << *Dilogic;
-      *Err = true;
-    }
-    return (true);
-  } else {
-    return (false);
-  }
-}
-
-/// Decode the HMPID error BitMap field (5 bits) and returns true if there are
-/// errors and in addition the concat string that contains the error messages
-/// ATTENTION : the char * outbuf MUST point to a 250 bytes buffer
-/// @param[in] ErrorField : the HMPID Error field
-/// @param[out] *outbuf : the output buffer that contains the error description
-/// @returns True if EoE marker is detected
-bool HmpidDecoder::decodeHmpidError(int ErrorField, char* outbuf)
-{
-  int res = false;
-  outbuf[0] = '\0';
-  for (int i = 0; i < MAXHMPIDERRORS; i++) {
-    if ((ErrorField & (0x01 << i)) != 0) {
-      res = true;
-      strcat(outbuf, sHmpidErrorDescription[i]);
-    }
-  }
-  return (res);
-}
-
-/// This Decode the Raw Data Header, returns the EquipmentIndex
-/// that is obtained with the FLP hardware coords
-///
-/// ATTENTION : the 'EquipIndex' parameter and the mEquipment member
-/// are different data: the first is the pointer in the Equipments instances
-/// array, the second is the FEE_ID number
-///
-/// The EVENT_NUMBER : actually is calculated from the ORBIT number
-///
-/// @param[in] *streamPtrAdr : the pointer to the Header buffer
-/// @param[out] *EquipIndex : the Index to the Equipment Object Array [0..13]
-/// @returns True every time
-/// @throws TH_WRONGEQUIPINDEX Thrown if the Equipment Index is out of boundary (Equipment not recognized)
-int HmpidDecoder::decodeHeader(uint32_t* streamPtrAdr, int* EquipIndex)
-{
-  uint32_t* buffer = streamPtrAdr; // Sets the pointer to buffer
-  o2::header::RAWDataHeader* hpt = (o2::header::RAWDataHeader*)buffer;
-
-  /*
-  mHeFEEID = (buffer[0] & 0x000f0000) >> 16;
-  mHeSize = (buffer[0] & 0x0000ff00) >> 8;
-  mHeVer = (buffer[0] & 0x000000ff);
-  mHePrior = (buffer[1] & 0x000000FF);
-  mHeDetectorID = (buffer[1] & 0x0000FF00) >> 8;
-  mHeOffsetNewPack = (buffer[2] & 0x0000FFFF);
-  mHeMemorySize = (buffer[2] & 0xffff0000) >> 16;
-  mHeDW = (buffer[3] & 0xF0000000) >> 24;
-  mHeCruID = (buffer[3] & 0x0FF0000) >> 16;
-  mHePackNum = (buffer[3] & 0x0000FF00) >> 8;
-  mHeLinkNum = (buffer[3] & 0x000000FF);
-  mHeBCDI = (buffer[4] & 0x00000FFF);
-  mHeORBIT = buffer[5];
-  mHeTType = buffer[8];
-  mHePageNum = (buffer[9] & 0x0000FFFF);
-  mHeStop = (buffer[9] & 0x00ff0000) >> 16;
-  mHeBusy = (buffer[12] & 0xfffffe00) >> 9;
-  mHeFirmwareVersion = buffer[12] & 0x0000000f;
-  mHeHmpidError = (buffer[12] & 0x000001F0) >> 4;
-  mHePAR = buffer[13] & 0x0000FFFF;
-  */
-  mHeFEEID = hpt->feeId;
-  mHeSize = hpt->headerSize;
-  mHeVer = hpt->version;
-  mHePrior = hpt->priority;
-  mHeDetectorID = hpt->sourceID;
-  mHeOffsetNewPack = hpt->offsetToNext;
-  mHeMemorySize = hpt->memorySize;
-  mHeDW = hpt->endPointID;
-  mHeCruID = hpt->cruID;
-  mHePackNum = hpt->packetCounter;
-  mHeLinkNum = hpt->linkID;
-  mHeBCDI = hpt->bunchCrossing;
-  mHeORBIT = hpt->orbit;
-  mHeTType = hpt->triggerType;
-  mHePageNum = hpt->pageCnt;
-  mHeStop = hpt->stop;
-  mHeBusy = (hpt->detectorField & 0xfffffe00) >> 9;
-  mHeFirmwareVersion = hpt->detectorField & 0x0000000f;
-  mHeHmpidError = (hpt->detectorField & 0x000001F0) >> 4;
-  mHePAR = hpt->detectorPAR;
-
-  *EquipIndex = getEquipmentIndex(mHeCruID, mHeLinkNum);
-  //  mEquipment = (*EquipIndex != -1) ? mTheEquipments[*EquipIndex]->getEquipmentId() : -1;
-  mEquipment = mHeFEEID & 0x000F;
-  mNumberWordToRead = ((mHeMemorySize - mHeSize) / sizeof(uint32_t));
-  mPayloadTail = ((mHeOffsetNewPack - mHeMemorySize) / sizeof(uint32_t));
-
-  // ---- Event ID  : Actualy based on ORBIT NUMBER and BC
-  mHeEvent = (mHeORBIT << 12) | mHeBCDI;
-
-  LOG(debug) << "FEE-ID=" << mHeFEEID << " HeSize=" << mHeSize << " HePrior=" << mHePrior << " Det.Id=" << mHeDetectorID << " HeMemorySize=" << mHeMemorySize << " HeOffsetNewPack=" << mHeOffsetNewPack;
-  LOG(debug) << "      Equipment=" << mEquipment << " PakCounter=" << mHePackNum << " Link=" << mHeLinkNum << " CruID=" << mHeCruID << " DW=" << mHeDW << " BC=" << mHeBCDI << " ORBIT=" << mHeORBIT;
-  LOG(debug) << "      TType=" << mHeTType << " HeStop=" << mHeStop << " PagesCounter=" << mHePageNum << " FirmVersion=" << mHeFirmwareVersion << " BusyTime=" << mHeBusy << " Error=" << mHeHmpidError << " PAR=" << mHePAR;
-  LOG(debug) << "      EquIdx = " << *EquipIndex << " Event = " << mHeEvent << " Payload :  Words to read=" << mNumberWordToRead << " PailoadTail=" << mPayloadTail;
-
-  if (*EquipIndex == -1) {
-    LOG(error) << "ERROR ! Bad equipment Number: " << mEquipment;
-    throw TH_WRONGEQUIPINDEX;
-  }
-  // std::cout << "HMPID ! Exit decode header" << std::endl;
-  return (true);
-}
-
-/// Updates some information related to the Event
-/// this function is called at the end of the event
-/// @param[in] *eq : the pointer to the Equipment Object
-void HmpidDecoder::updateStatistics(HmpidEquipment* eq)
-{
-  eq->mPadsPerEventAverage = ((eq->mPadsPerEventAverage * (eq->mNumberOfEvents - 1)) + eq->mSampleNumber) / (eq->mNumberOfEvents);
-  eq->mEventSizeAverage = ((eq->mEventSizeAverage * (eq->mNumberOfEvents - 1)) + eq->mEventSize) / (eq->mNumberOfEvents);
-  eq->mBusyTimeAverage = ((eq->mBusyTimeAverage * eq->mBusyTimeSamples) + eq->mBusyTimeValue) / (++(eq->mBusyTimeSamples));
-  if (eq->mSampleNumber == 0) {
-    eq->mNumberOfEmptyEvents += 1;
-  }
-  if (eq->mErrorsCounter > 0) {
-    eq->mNumberOfWrongEvents += 1;
-  }
-  eq->mTotalPads += eq->mSampleNumber;
-  eq->mTotalErrors += eq->mErrorsCounter;
-
-  //std::cout << ">>>updateStatistics() >>> "<< eq->getEquipmentId() << "="<< eq->mNumberOfEvents<<" :" << eq->mEventSize <<","<< eq->mTotalPads << ", " << eq->mSampleNumber << std::endl;
-
-  return;
-}
-
-/// Evaluates the content of the header and detect the change of the event
-/// with the relevant updates...
-/// @param[in] EquipmentIndex : the pointer to the Array of Equipments Array
-/// @returns the Pointer to the modified Equipment object
-HmpidEquipment* HmpidDecoder::evaluateHeaderContents(int EquipmentIndex)
-{
-  //std::cout << "Enter evaluateHeaderContents..";
-  HmpidEquipment* eq = mTheEquipments[EquipmentIndex];
-  if (mHeEvent != eq->mEventNumber) {              // Is a new event
-    if (eq->mEventNumber != OUTRANGEEVENTNUMBER) { // skip the first
-      updateStatistics(eq);                        // update previous statistics
-    }
-    eq->mNumberOfEvents++;
-    eq->mEventNumber = mHeEvent;
-    eq->mBusyTimeValue = mHeBusy * 0.00000005;
-    eq->mEventSize = 0; // reset the event
-    eq->mSampleNumber = 0;
-    eq->mErrorsCounter = 0;
-    mIntReco = {(uint16_t)mHeBCDI, (uint32_t)mHeORBIT};
-  }
-  eq->mEventSize += mNumberWordToRead * sizeof(uint32_t); // Calculate the size in bytes
-  if (mHeHmpidError != 0) {
-    LOG(info) << "HMPID Header reports an error : " << mHeHmpidError;
-    dumpHmpidError(mHeHmpidError);
-    eq->setError(ERR_HMPID);
-  }
-  // std::cout << ".. end evaluateHeaderContents = " << eq->mEventNumber << std::endl;
-  return (eq);
-}
-
-/// --------------- Decode One Page from Data Buffer ---------------
-/// Read the stream, decode the contents and store resuls.
-/// ATTENTION : Assumes that the input stream was set
-/// @throws TH_WRONGHEADER Thrown if the Fails to decode the Header
-/// @param[in] streamBuf : the pointer to the Pointer of the Stream Buffer
-void HmpidDecoder::decodePage(uint32_t** streamBuf)
-{
-  int equipmentIndex;
-  try {
-    getHeaderFromStream(streamBuf);
-  } catch (int e) {
-    // The stream end !
-    LOG(debug) << "End main decoding loop !";
-    throw TH_BUFFEREMPTY;
-  }
-  try {
-    decodeHeader(*streamBuf, &equipmentIndex);
-  } catch (int e) {
-    LOG(error) << "Failed to decode the Header !";
-    throw TH_WRONGHEADER;
-  }
-
-  HmpidEquipment* eq = evaluateHeaderContents(equipmentIndex);
-
-  uint32_t wpprev = 0;
-  uint32_t wp = 0;
-  int newOne = true;
-  int p1, p2, p3, p4;
-  int error;
-  int type;
-  bool isIt;
-
-  int payIndex = 0;
-  while (payIndex < mNumberWordToRead) { //start the payload loop word by word
-    if (newOne == true) {
-      wpprev = wp;
-      if (!getWordFromStream(&wp)) { // end the stream
-        break;
-      }
-      type = checkType(wp, &p1, &p2, &p3, &p4);
-      if (type == WTYPE_NONE) {
-        if (eq->mWillBePad == true) { // try to recover the first pad !
-          type = checkType((wp & 0xF7FFFFFF), &p1, &p2, &p3, &p4);
-          if (type == WTYPE_PAD && p3 == 0 && eq->mWordsPerDilogicCounter == 0) {
-            newOne = false; // # reprocess as pad
-            continue;
-          }
-        }
-        eq->setError(ERR_NOTKNOWN);
-        LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_NOTKNOWN] << " [" << wp << "]";
-        eq->mWordsPerRowCounter++;
-        eq->mWordsPerSegCounter++;
-        payIndex++;
-        continue;
-      }
-    }
-    if (mEquipment == 8) {
-      LOG(info) << "Event" << eq->mEventNumber << " >" << std::hex << wp << std::dec << "<" << type;
-    }
-    if (eq->mWillBeRowMarker == true) { // #shoud be a Row Marker
-      if (type == WTYPE_ROW) {
-        eq->mColumnCounter++;
-        eq->mWordsPerSegCounter++;
-        eq->mRowSize = p2;
-        switch (p2) {
-          case 0: // Empty column
-            eq->setError(ERR_ROWMARKEMPTY);
-            LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_ROWMARKEMPTY] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-            eq->mWillBeRowMarker = true;
-            break;
-          case 0x3FF: // Error in column
-            eq->setError(ERR_ROWMARKERROR);
-            LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_ROWMARKERROR] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-            eq->mWillBeRowMarker = true;
-            break;
-          case 0x3FE: // Masked column
-            LOG(info) << "Equip=" << mEquipment << "The column=" << (eq->mSegment) * 8 + eq->mColumnCounter << " is Masked !";
-            eq->mWillBeRowMarker = true;
-            break;
-          default:
-            eq->mWillBeRowMarker = false;
-            eq->mWillBePad = true;
-            break;
-        }
-        newOne = true;
-      } else {
-        if (wp == wpprev) {
-          eq->setError(ERR_DUPLICATEPAD);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_DUPLICATEPAD] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-          newOne = true;
-        } else if (type == WTYPE_EOE) { // # Could be a EoE
-          eq->mColumnCounter++;
-          eq->setError(ERR_ROWMARKWRONG);
-          eq->mWillBeRowMarker = false;
-          eq->mWillBePad = true;
-          newOne = true;
-        } else if (type == WTYPE_PAD) { //# Could be a PAD
-          eq->mColumnCounter++;
-          eq->setError(ERR_ROWMARKLOST);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_ROWMARKLOST] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-          eq->mWillBeRowMarker = false;
-          eq->mWillBePad = true;
-          newOne = true;
-        } else if (type == WTYPE_EOS) { // # Could be a EoS
-          eq->mWillBeRowMarker = false;
-          eq->mWillBeSegmentMarker = true;
-          newOne = false;
-        } else {
-          eq->mColumnCounter++;
-          eq->setError(ERR_ROWMARKLOST);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_ROWMARKLOST] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-          eq->mWillBeRowMarker = false;
-          eq->mWillBePad = true;
-          newOne = true;
-        }
-      }
-    } else if (eq->mWillBePad == true) { // # We expect a pad
-      //# PAD:0000.0ccc.ccdd.ddnn.nnnn.vvvv.vvvv.vvvv :: c=col,d=dilo,n=chan,v=value
-      //   c = 1..24   d = 1..10  n = 0..47
-      if (type == WTYPE_PAD) {
-        newOne = true;
-        if (wp == wpprev) {
-          eq->setError(ERR_DUPLICATEPAD);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_DUPLICATEPAD] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-        } else if (p1 != (eq->mSegment * 8 + eq->mColumnCounter)) { // # Manage
-          // We try to recover the RowMarker misunderstanding
-          isIt = isRowMarker(wp, &error, &p2, &p1);
-          if (isIt == true && error == false) {
-            type = WTYPE_ROW;
-            newOne = false;
-            eq->mWillBeEoE = true;
-            eq->mWillBePad = false;
-          } else {
-            LOG(debug) << "Equip=" << mEquipment << " Mismatch in column"
-                       << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-            eq->mColumnCounter = p1 % 8;
-          }
-        } else {
-          setPad(eq, p1 - 1, p2 - 1, p3, p4);
-          if (mEquipment == 8) {
-            LOG(info) << "Event" << eq->mEventNumber << " >" << p1 - 1 << "," << p2 - 1 << "," << p3 << "," << p4;
-          }
-          eq->mWordsPerDilogicCounter++;
-          eq->mSampleNumber++;
-          if (p3 == 47) {
-            eq->mWillBeEoE = true;
-            eq->mWillBePad = false;
-          }
-        }
-        eq->mWordsPerRowCounter++;
-        eq->mWordsPerSegCounter++;
-      } else if (type == WTYPE_EOE) { //# the pads are end ok
-        eq->mWillBeEoE = true;
-        eq->mWillBePad = false;
-        newOne = false;
-      } else if (type == WTYPE_ROW) { // # We Lost the EoE !
-        // We try to recover the PAD misunderstanding
-        isIt = isPadWord(wp, &error, &p1, &p2, &p3, &p4);
-        if (isIt == true && error == false) {
-          type = WTYPE_PAD;
-          newOne = false; // # reprocess as pad
-        } else {
-          eq->setError(ERR_LOSTEOEMARK);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_LOSTEOEMARK] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-          eq->mWillBeRowMarker = true;
-          eq->mWillBePad = false;
-          newOne = false;
-        }
-      } else if (type == WTYPE_EOS) { // # We Lost the EoE !
-        eq->setError(ERR_LOSTEOEMARK);
-        LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_LOSTEOEMARK] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-        eq->mWillBeSegmentMarker = true;
-        eq->mWillBePad = false;
-        newOne = false;
-      }
-    } else if (eq->mWillBeEoE == true) { // # We expect a EoE
-      if (type == WTYPE_EOE) {
-        eq->mWordsPerRowCounter++;
-        eq->mWordsPerSegCounter++;
-        if (wpprev == wp) {
-          eq->setError(ERR_DOUBLEEOEMARK);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_DOUBLEEOEMARK] << " col=" << p1;
-        } else if (p3 != eq->mWordsPerDilogicCounter) {
-          eq->setError(ERR_WRONGSIZEINEOE);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_WRONGSIZEINEOE] << " col=" << p1;
-        }
-        eq->mWordsPerDilogicCounter = 0;
-        if (p2 == 10) {
-          if (p1 % 8 != 0) { // # we expect the Row Marker
-            eq->mWillBeRowMarker = true;
-          } else {
-            eq->mWillBeSegmentMarker = true;
-          }
-        } else {
-          eq->mWillBePad = true;
-        }
-        eq->mWillBeEoE = false;
-        newOne = true;
-      } else if (type == WTYPE_EOS) { // We Lost the EoE !
-        eq->setError(ERR_LOSTEOEMARK);
-        LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_LOSTEOEMARK] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-        eq->mWillBeSegmentMarker = true;
-        eq->mWillBeEoE = false;
-        newOne = false;
-      } else if (type == WTYPE_ROW) { //# We Lost the EoE !
-        eq->setError(ERR_LOSTEOEMARK);
-        LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_LOSTEOEMARK] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-        eq->mWillBeRowMarker = true;
-        eq->mWillBeEoE = false;
-        newOne = false;
-      } else if (type == WTYPE_PAD) { // # We Lost the EoE !
-        int typb, p1b, p2b, p3b, p4b;
-        typb = checkType((wp | 0x08000000), &p1b, &p2b, &p3b, &p4b);
-        if (typb == WTYPE_EOE && p3b == 48) {
-          type = typb;
-          p1 = p1b;
-          p2 = p2b;
-          p3 = p3b;
-          p4 = p4b;
-          newOne = false; // # reprocess as EoE
-        } else {
-          eq->setError(ERR_LOSTEOEMARK);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_LOSTEOEMARK] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-          eq->mWillBePad = true;
-          eq->mWillBeEoE = false;
-          newOne = false;
-        }
-      }
-    } else if (eq->mWillBeSegmentMarker == true) { // # We expect a EoSegment
-      if (wpprev == wp) {
-        eq->setError(ERR_DOUBLEMARKWORD);
-        LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_DOUBLEMARKWORD] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-        newOne = true;
-      } else if (type == 2) {
-        if (abs(eq->mWordsPerSegCounter - p2) > 5) {
-          eq->setError(ERR_WRONGSIZESEGMENTMARK);
-          LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_WRONGSIZESEGMENTMARK] << " Seg=" << p2;
-        }
-        eq->mWordsPerSegCounter = 0;
-        eq->mWordsPerRowCounter = 0;
-        eq->mColumnCounter = 0;
-        eq->mSegment = p3 % 3;
-        eq->mWillBeRowMarker = true;
-        eq->mWillBeSegmentMarker = false;
-        newOne = true;
-      } else {
-        eq->setError(ERR_LOSTEOSMARK);
-        LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_LOSTEOSMARK] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << p1 << "]";
-        eq->mWillBeSegmentMarker = false;
-        eq->mWillBeRowMarker = true;
-        newOne = false;
-      }
-    }
-    if (newOne) {
-      payIndex += 1;
-    }
-  }
-  for (int i = 0; i < mPayloadTail; i++) { // move the pointer to skip the Payload Tail
-    getWordFromStream(&wp);
-  }
-}
-
-/// --------------- Read Raw Data Buffer ---------------
-/// Read the stream, decode the contents and store resuls.
-/// ATTENTION : Assumes that the input stream was set
-/// @throws TH_WRONGHEADER Thrown if the Fails to decode the Header
-bool HmpidDecoder::decodeBuffer()
-{
-  // ---------resets the PAdMap-----------
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    mTheEquipments[i]->init();
-    mTheEquipments[i]->resetPadMap();
-    mTheEquipments[i]->resetErrors();
-  }
-
-  int type;
-  int equipmentIndex = -1;
-  int isIt;
-  HmpidEquipment* eq;
-  uint32_t* streamBuf;
-  LOG(debug) << "Enter decoding !";
-
-  // Input Stream Main Loop
-  while (true) {
-    try {
-      decodePage(&streamBuf);
-    } catch (int e) {
-      LOG(debug) << "End main buffer decoding loop !";
-      break;
-    }
-  } // this is the end of stream
-
-  // cycle in order to update info for the last event
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    if (mTheEquipments[i]->mNumberOfEvents > 0) {
-      updateStatistics(mTheEquipments[i]);
-    }
-  }
-  return (true);
-}
-
-/// --------- Decode One Page from Data Buffer with Fast Decoding --------
-/// Read the stream, decode the contents and store resuls.
-/// ATTENTION : Assumes that the input stream was set
-/// @throws TH_WRONGHEADER Thrown if the Fails to decode the Header
-/// @param[in] streamBuf : the pointer to the Pointer of the Stream Buffer
-void HmpidDecoder::decodePageFast(uint32_t** streamBuf)
-{
-  int equipmentIndex;
-  try {
-    getHeaderFromStream(streamBuf);
-  } catch (int e) {
-    // The stream end !
-    LOG(info) << "End Fast Page decoding loop !";
-    throw TH_BUFFEREMPTY;
-  }
-  try {
-    decodeHeader(*streamBuf, &equipmentIndex);
-  } catch (int e) {
-    LOG(info) << "Failed to decode the Header !";
-    throw TH_WRONGHEADER;
-  }
-  HmpidEquipment* eq = evaluateHeaderContents(equipmentIndex);
-  uint32_t wpprev = 0;
-  uint32_t wp = 0;
-  int newOne = true;
-  int Column, Dilogic, Channel, Charge;
-  int pwer;
-  int payIndex = 0;
-  while (payIndex < mNumberWordToRead) { //start the payload loop word by word
-    wpprev = wp;
-    if (!getWordFromStream(&wp)) { // end the stream
-      break;
-    }
-    if (wp == wpprev) {
-      LOG(debug) << "Equip=" << mEquipment << sErrorDescription[ERR_DUPLICATEPAD] << " col=" << (eq->mSegment) * 8 + eq->mColumnCounter << "[" << Column << "]";
-    } else {
-      if (isPadWord(wp, &pwer, &Column, &Dilogic, &Channel, &Charge) == true) {
-        if (pwer != true) {
-          setPad(eq, Column - 1, Dilogic - 1, Channel, Charge);
-          eq->mSampleNumber++;
-        }
-      }
-    }
-    payIndex += 1;
-  }
-  for (int i = 0; i < mPayloadTail; i++) { // move the pointer to skip the Payload Tail
-    getWordFromStream(&wp);
-  }
-  return;
-}
-/// ---------- Read Raw Data Buffer with Fast Decoding ----------
-/// Read the stream, decode the contents and store resuls.
-/// Fast alghoritm : no parsing of control words !
-/// ATTENTION : Assumes that the input stream was set
-/// @throws TH_WRONGHEADER Thrown if the Fails to decode the Header
-bool HmpidDecoder::decodeBufferFast()
-{
-  // ---------resets the PAdMap-----------
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    mTheEquipments[i]->init();
-    mTheEquipments[i]->resetPadMap();
-  }
-
-  uint32_t* streamBuf;
-  LOG(info) << "Enter FAST decoding !";
-
-  // Input Stream Main Loop
-  while (true) {
-    try {
-      decodePageFast(&streamBuf);
-    } catch (int e) {
-      LOG(info) << " End Buffer Fast Decoding !";
-      break;
-    }
-  } // this is the end of stream
-
-  // cycle in order to update info for the last event
-  for (int i = 0; i < mNumberOfEquipments; i++) {
-    if (mTheEquipments[i]->mNumberOfEvents > 0) {
-      updateStatistics(mTheEquipments[i]);
-    }
-  }
-  return (true);
-}
-
-// =========================================================
-
-/// Getter method to extract Statistic Data in Digit Coords
-/// @param[in] Module : the HMPID Module number [0..6]
-/// @param[in] Column : the HMPID Module Column number [0..143]
-/// @param[in] Row : the HMPID Module Row number [0..159]
-/// @returns The Number of entries for specified pad
-uint16_t HmpidDecoder::getPadSamples(int Module, int Row, int Column)
-{
-  int e, c, d, h;
-  o2::hmpid::Digit::absolute2Equipment(Module, Row, Column, &e, &c, &d, &h);
-  int EqInd = getEquipmentIndex(e);
-  if (EqInd < 0) {
-    return (0);
-  }
-  return (mTheEquipments[EqInd]->mPadSamples[c][d][h]);
-}
-
-/// Getter method to extract Statistic Data in Digit Coords
-/// @param[in] Module : the HMPID Module number [0..6]
-/// @param[in] Column : the HMPID Module Column number [0..143]
-/// @param[in] Row : the HMPID Module Row number [0..159]
-/// @returns The Sum of Charges for specified pad
-double HmpidDecoder::getPadSum(int Module, int Row, int Column)
-{
-  int e, c, d, h;
-  o2::hmpid::Digit::absolute2Equipment(Module, Row, Column, &e, &c, &d, &h);
-  int EqInd = getEquipmentIndex(e);
-  if (EqInd < 0) {
-    return (0);
-  }
-  return (mTheEquipments[EqInd]->mPadSum[c][d][h]);
-}
-
-/// Getter method to extract Statistic Data in Digit Coords
-/// @param[in] Module : the HMPID Module number [0..6]
-/// @param[in] Column : the HMPID Module Column number [0..143]
-/// @param[in] Row : the HMPID Module Row number [0..159]
-/// @returns The Sum of Square Charges for specified pad
-double HmpidDecoder::getPadSquares(int Module, int Row, int Column)
-{
-  int e, c, d, h;
-  o2::hmpid::Digit::absolute2Equipment(Module, Row, Column, &e, &c, &d, &h);
-  int EqInd = getEquipmentIndex(e);
-  if (EqInd < 0) {
-    return (0);
-  }
-  return (mTheEquipments[EqInd]->mPadSquares[c][d][h]);
-}
-
-/// Getter method to extract Statistic Data in Hardware Coords
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-/// @param[in] Column : the HMPID Module Column number [0..23]
-/// @param[in] Dilogic : the HMPID Module Row number [0..9]
-/// @param[in] Channel : the HMPID Module Row number [0..47]
-/// @returns The Number of Entries for specified pad
-uint16_t HmpidDecoder::getChannelSamples(int EquipmId, int Column, int Dilogic, int Channel)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return (0);
-  }
-  return (mTheEquipments[EqInd]->mPadSamples[Column][Dilogic][Channel]);
-}
-
-/// Getter method to extract Statistic Data in Hardware Coords
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-/// @param[in] Column : the HMPID Module Column number [0..23]
-/// @param[in] Dilogic : the HMPID Module Row number [0..9]
-/// @param[in] Channel : the HMPID Module Row number [0..47]
-/// @returns The Sum of Charges for specified pad
-double HmpidDecoder::getChannelSum(int EquipmId, int Column, int Dilogic, int Channel)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return (0);
-  }
-  return (mTheEquipments[EqInd]->mPadSum[Column][Dilogic][Channel]);
-}
-
-/// Getter method to extract Statistic Data in Hardware Coords
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-/// @param[in] Column : the HMPID Module Column number [0..23]
-/// @param[in] Dilogic : the HMPID Module Row number [0..9]
-/// @param[in] Channel : the HMPID Module Row number [0..47]
-/// @returns The Sum of Square Charges for specified pad
-double HmpidDecoder::getChannelSquare(int EquipmId, int Column, int Dilogic, int Channel)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return (0);
-  }
-  return (mTheEquipments[EqInd]->mPadSquares[Column][Dilogic][Channel]);
-}
-
-/// Gets the Average Event Size value
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-/// @returns The Average Event Size value ( 0 for wrong Equipment Id)
-float HmpidDecoder::getAverageEventSize(int EquipmId)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return (0.0);
-  }
-  return (mTheEquipments[EqInd]->mEventSizeAverage);
-}
-
-/// Gets the Average Busy Time value
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-/// @returns The Average Busy Time value ( 0 for wrong Equipment Id)
-float HmpidDecoder::getAverageBusyTime(int EquipmId)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return (0.0);
-  }
-  return (mTheEquipments[EqInd]->mBusyTimeAverage);
-}
-
-// ===================================================
-// Methods to dump info
-
-/// Prints on the standard output the table of decoding
-/// errors for one equipment
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-void HmpidDecoder::dumpErrors(int EquipmId)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return;
-  }
-  std::cout << "Dump Errors for the Equipment = " << EquipmId << std::endl;
-  for (int i = 0; i < MAXERRORS; i++) {
-    std::cout << sErrorDescription[i] << "  = " << mTheEquipments[EqInd]->mErrors[i] << std::endl;
-  }
-  std::cout << " -------- " << std::endl;
-  return;
-}
-
-/// Prints on the standard output a Table of statistical
-/// decoding information for one equipment
-/// @param[in] EquipmId : the HMPID EquipmentId [0..13]
-/// @type[in] The type of info.  0 = Entries, 1 = Sum, 2 = Sum of squares
-void HmpidDecoder::dumpPads(int EquipmId, int type)
-{
-  int EqInd = getEquipmentIndex(EquipmId);
-  if (EqInd < 0) {
-    return;
-  }
-  int Module = EquipmId / 2;
-  int StartRow = (EquipmId % 2 == 1) ? 80 : 0;
-  int EndRow = (EquipmId % 2 == 1) ? 160 : 80;
-  std::cout << "Dump Pads for the Equipment = " << EquipmId << std::endl;
-  for (int c = 0; c < 144; c++) {
-    for (int r = StartRow; r < EndRow; r++) {
-      switch (type) {
-        case 0:
-          std::cout << getPadSamples(Module, r, c) << ",";
-          break;
-        case 1:
-          std::cout << getPadSum(Module, r, c) << ",";
-          break;
-        case 2:
-          std::cout << getPadSquares(Module, r, c) << ",";
-          break;
-      }
-    }
-    std::cout << std::endl;
-  }
-  std::cout << " -------- " << std::endl;
-  return;
-}
-
-/// Prints on the standard output the decoded HMPID error field
-/// @param[in] ErrorField : the HMPID readout error field
-void HmpidDecoder::dumpHmpidError(int ErrorField)
-{
-  char printbuf[MAXHMPIDERRORS * MAXDESCRIPTIONLENGHT];
-  if (decodeHmpidError(ErrorField, printbuf) == true) {
-    LOG(error) << "HMPID Error field = " << ErrorField << " : " << printbuf;
-  }
-  return;
-}
-
-/// Writes in a ASCCI File the complete report of the decoding
-/// procedure
-/// @param[in] *summaryFileName : the name of the output file
-/// @throws TH_CREATEFILE Thrown if was not able to create the file
-void HmpidDecoder::writeSummaryFile(char* summaryFileName)
-{
-  FILE* fs = fopen(summaryFileName, "w");
-  if (fs == nullptr) {
-    printf("Error opening the file %s !\n", summaryFileName);
-    throw TH_CREATEFILE;
-  }
-
-  fprintf(fs, "HMPID Readout Raw Data Decoding Summary File\n");
-  fprintf(fs, "Equipment Id\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%d\t", mTheEquipments[i]->getEquipmentId());
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Number of events\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%d\t", mTheEquipments[i]->mNumberOfEvents);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Average Event Size\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%f\t", mTheEquipments[i]->mEventSizeAverage);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Total pads\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%d\t", mTheEquipments[i]->mTotalPads);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Average pads per event\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%f\t", mTheEquipments[i]->mPadsPerEventAverage);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Busy Time average\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%e\t", mTheEquipments[i]->mBusyTimeAverage);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Event rate\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%e\t", 1 / mTheEquipments[i]->mBusyTimeAverage);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "Number of Empty Events\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%d\t", mTheEquipments[i]->mNumberOfEmptyEvents);
-  }
-  fprintf(fs, "\n");
-
-  fprintf(fs, "-------------Errors--------------------\n");
-  fprintf(fs, "Wrong events\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%d\t", mTheEquipments[i]->mNumberOfWrongEvents);
-  }
-  fprintf(fs, "\n");
-
-  for (int j = 0; j < MAXERRORS; j++) {
-    fprintf(fs, "%s\t", sErrorDescription[j]);
-    for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-      fprintf(fs, "%d\t", mTheEquipments[i]->mErrors[j]);
-    }
-    fprintf(fs, "\n");
-  }
-
-  fprintf(fs, "Total errors\t");
-  for (int i = 0; i < Geo::MAXEQUIPMENTS; i++) {
-    fprintf(fs, "%d\t", mTheEquipments[i]->mTotalErrors);
-  }
-  fprintf(fs, "\n");
-
-  fclose(fs);
-  return;
-}
diff --git a/Detectors/HMPID/workflow/include/HMPIDWorkflow/ClusterizerSpec.h_notused.h b/Detectors/HMPID/workflow/include/HMPIDWorkflow/ClusterizerSpec.h_notused.h
deleted file mode 100644
index 6102ec481c97c..0000000000000
--- a/Detectors/HMPID/workflow/include/HMPIDWorkflow/ClusterizerSpec.h_notused.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef STEER_DIGITIZERWORKFLOW_HMPIDCLUSTERIZER_H_
-#define STEER_DIGITIZERWORKFLOW_HMPIDCLUSTERIZER_H_
-
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace hmpid
-{
-
-o2::framework::DataProcessorSpec getHMPIDClusterizerSpec(bool useMC);
-
-} // end namespace hmpid
-} // end namespace o2
-
-#endif /* STEER_DIGITIZERWORKFLOW_HMPIDCLUSTERIZERSPEC_H_ */
diff --git a/Detectors/HMPID/workflow/include/HMPIDWorkflow/DigitReaderSpec.h_notused.h b/Detectors/HMPID/workflow/include/HMPIDWorkflow/DigitReaderSpec.h_notused.h
deleted file mode 100644
index eea9b134bd911..0000000000000
--- a/Detectors/HMPID/workflow/include/HMPIDWorkflow/DigitReaderSpec.h_notused.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   DigitReader.h
-
-#ifndef O2_HMPID_DIGITREADER
-#define O2_HMPID_DIGITREADER
-
-#include "TFile.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/Task.h"
-#include "DataFormatsHMP/Digit.h"
-#include "SimulationDataFormat/MCCompLabel.h"
-#include "SimulationDataFormat/MCTruthContainer.h"
-
-namespace o2
-{
-namespace hmpid
-{
-
-class DigitReader : public o2::framework::Task
-{
- public:
-  DigitReader(bool useMC) : mUseMC(useMC) {}
-  ~DigitReader() override = default;
-  void init(o2::framework::InitContext& ic) final;
-  void run(o2::framework::ProcessingContext& pc) final;
-
- private:
-  int mState = 0;
-  bool mUseMC = true;
-  std::unique_ptr<TFile> mFile = nullptr;
-
-  std::vector<o2::hmpid::Digit> mDigits, *mPdigits = &mDigits;
-
-  o2::dataformats::MCTruthContainer<o2::MCCompLabel> mLabels, *mPlabels = &mLabels;
-};
-
-/// read simulated HMPID digits from a root file
-framework::DataProcessorSpec getDigitReaderSpec(bool useMC);
-
-} // namespace hmpid
-} // namespace o2
-
-#endif /* O2_HMPID_DIGITREADER */
diff --git a/Detectors/ITSMFT/MFT/calibration/include/MFTCalibration/NoiseSlotCalibrator.h b/Detectors/ITSMFT/MFT/calibration/include/MFTCalibration/NoiseSlotCalibrator.h
deleted file mode 100644
index a8280467b14c9..0000000000000
--- a/Detectors/ITSMFT/MFT/calibration/include/MFTCalibration/NoiseSlotCalibrator.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   NoiseSlotCalibrator.h
-
-#ifndef O2_MFT_NOISESLOTCALIBRATOR
-#define O2_MFT_NOISESLOTCALIBRATOR
-
-#include <string>
-
-#include "DetectorsCalibration/TimeSlotCalibration.h"
-#include "DetectorsCalibration/TimeSlot.h"
-
-#include "DataFormatsITSMFT/CompCluster.h"
-#include "DataFormatsITSMFT/Digit.h"
-#include "DataFormatsITSMFT/NoiseMap.h"
-#include "gsl/span"
-
-namespace o2
-{
-
-namespace itsmft
-{
-class ROFRecord;
-} // namespace itsmft
-
-namespace mft
-{
-
-class NoiseSlotCalibrator : public o2::calibration::TimeSlotCalibration<o2::itsmft::NoiseMap>
-{
-  using Slot = calibration::TimeSlot<o2::itsmft::NoiseMap>;
-
- public:
-  NoiseSlotCalibrator() { setUpdateAtTheEndOfRunOnly(); }
-  NoiseSlotCalibrator(float prob, float relErr) : mProbabilityThreshold(prob), mProbRelErr(relErr)
-  {
-    setUpdateAtTheEndOfRunOnly();
-    setSlotLength(INFINITE_TF);
-    mMinROFs = 1.1 * o2::itsmft::NoiseMap::getMinROFs(prob, relErr);
-    LOGP(info, "At least {} ROFs needed to apply threshold {} with relative error {}", mMinROFs, mProbabilityThreshold, mProbRelErr);
-  }
-  ~NoiseSlotCalibrator() final = default;
-
-  void setThreshold(unsigned int t) { mThreshold = t; }
-
-  bool processTimeFrame(calibration::TFType tf,
-                        gsl::span<const o2::itsmft::Digit> const& digits,
-                        gsl::span<const o2::itsmft::ROFRecord> const& rofs);
-
-  bool processTimeFrame(calibration::TFType tf,
-                        gsl::span<const o2::itsmft::CompClusterExt> const& clusters,
-                        gsl::span<const unsigned char> const& patterns,
-                        gsl::span<const o2::itsmft::ROFRecord> const& rofs);
-
-  void setMinROFs(long n) { mMinROFs = n; }
-
-  void finalize()
-  {
-    LOG(info) << "Number of processed strobes is " << mNumberOfStrobes;
-    auto& slot = getSlots().back();
-    slot.getContainer()->applyProbThreshold(mProbabilityThreshold, mNumberOfStrobes);
-  }
-
-  const o2::itsmft::NoiseMap& getNoiseMap(long& start, long& end)
-  {
-    const auto& slot = getSlots().back();
-    start = slot.getTFStart();
-    end = slot.getTFEnd();
-    return *(slot.getContainer());
-  }
-
-  // Functions overloaded from the calibration framework
-  bool process(calibration::TFType tf, const gsl::span<const o2::itsmft::CompClusterExt> data) final;
-
-  // Functions required by the calibration framework
-  void initOutput() final {}
-  Slot& emplaceNewSlot(bool, calibration::TFType, calibration::TFType) final;
-  void finalizeSlot(Slot& slot) final;
-  bool hasEnoughData(const Slot& slot) const final;
-
- private:
-  float mProbabilityThreshold = 1e-6f;
-  float mProbRelErr = 0.2; // relative error on channel noise to apply the threshold
-  long mMinROFs = 0;
-  unsigned int mThreshold = 100;
-  unsigned int mNumberOfStrobes = 0;
-};
-
-} // namespace mft
-} // namespace o2
-
-#endif /* O2_MFT_NOISESLOTCALIBRATOR */
diff --git a/Detectors/ITSMFT/MFT/calibration/src/MchAlignment.cxx b/Detectors/ITSMFT/MFT/calibration/src/MchAlignment.cxx
deleted file mode 100644
index b9e590cca0b63..0000000000000
--- a/Detectors/ITSMFT/MFT/calibration/src/MchAlignment.cxx
+++ /dev/null
@@ -1,1660 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-//-----------------------------------------------------------------------------
-/// \file Alignment
-/// Alignment class for the ALICE DiMuon spectrometer
-///
-/// MUON specific alignment class which interface to AliMillepede.
-/// For each track ProcessTrack calculates the local and global derivatives
-/// at each cluster and fill the corresponding local equations. Provide methods
-/// for fixing or constraining detection elements for best results.
-///
-/// \author Javier Castillo Castellanos
-//-----------------------------------------------------------------------------
-
-#include "MCHAlign/Alignment.h"
-#include "MCHAlign/MillePede2.h"
-#include "MCHAlign/MillePedeRecord.h"
-#include <iostream>
-
-#include "MCHTracking/Track.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/Cluster.h"
-#include "TGeoManager.h"
-
-// #include "DataFormatsMCH/ROFRecord.h"
-// #include "DataFormatsMCH/TrackMCH.h"
-// #include "DataFormatsMCH/Cluster.h"
-// #include "DataFormatsMCH/Digit.h"
-
-// #include "AliMUONGeometryTransformer.h"
-// #include "AliMUONGeometryModuleTransformer.h"
-// #include "MCHAlign/AliMUONGeometryDetElement.h"
-// #include "AliMUONGeometryBuilder.h"
-#include "MCHGeometryCreator/Geometry.h"
-#include "MCHGeometryTest/Helpers.h"
-#include "MCHGeometryTransformer/Transformations.h"
-#include "TGeoManager.h"
-
-// #include "Align/Millepede2Record.h" //to be replaced
-// #include "AliMpExMap.h"
-// #include "AliMpExMapIterator.h"
-
-#include "DetectorsCommonDataFormats/AlignParam.h"
-#include "Framework/Logger.h"
-
-#include <TMath.h>
-#include <TMatrixDSym.h>
-#include <TMatrixD.h>
-#include <TClonesArray.h>
-#include <TGraphErrors.h>
-#include <TObject.h>
-
-namespace o2
-{
-namespace mch
-{
-
-using namespace std;
-
-//_____________________________________________________________________
-// static variables
-const Int_t Alignment::fgNDetElemCh[Alignment::fgNCh] = {4, 4, 4, 4, 18, 18, 26, 26, 26, 26};
-const Int_t Alignment::fgSNDetElemCh[Alignment::fgNCh + 1] = {0, 4, 8, 12, 16, 34, 52, 78, 104, 130, 156};
-
-// number of detector elements in each half-chamber
-const Int_t Alignment::fgNDetElemHalfCh[Alignment::fgNHalfCh] = {2, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 9, 13, 13, 13, 13, 13, 13, 13, 13};
-
-// list of detector elements for each half chamber
-const Int_t Alignment::fgDetElemHalfCh[Alignment::fgNHalfCh][Alignment::fgNDetHalfChMax] =
-  {
-    {100, 103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {101, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-    {200, 203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {201, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-    {300, 303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {301, 302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-    {400, 403, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {401, 402, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-    {500, 501, 502, 503, 504, 514, 515, 516, 517, 0, 0, 0, 0},
-    {505, 506, 507, 508, 509, 510, 511, 512, 513, 0, 0, 0, 0},
-
-    {600, 601, 602, 603, 604, 614, 615, 616, 617, 0, 0, 0, 0},
-    {605, 606, 607, 608, 609, 610, 611, 612, 613, 0, 0, 0, 0},
-
-    {700, 701, 702, 703, 704, 705, 706, 720, 721, 722, 723, 724, 725},
-    {707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719},
-
-    {800, 801, 802, 803, 804, 805, 806, 820, 821, 822, 823, 824, 825},
-    {807, 808, 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, 819},
-
-    {900, 901, 902, 903, 904, 905, 906, 920, 921, 922, 923, 924, 925},
-    {907, 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, 918, 919},
-
-    {1000, 1001, 1002, 1003, 1004, 1005, 1006, 1020, 1021, 1022, 1023, 1024, 1025},
-    {1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019}
-
-};
-
-//_____________________________________________________________________
-/// self initialized array, used for adding constraints
-class Array
-{
-
- public:
-  /// contructor
-  Array(void)
-  {
-    for (Int_t i = 0; i < Alignment::fNGlobal; ++i) {
-      values[i] = 0;
-    }
-  }
-
-  /// array
-  Double_t values[Alignment::fNGlobal];
-
- private:
-  /// Not implemented
-  Array(const Array&);
-
-  /// Not implemented
-  Array& operator=(const Array&);
-};
-
-//________________________________________________________________________
-Double_t Square(Double_t x) { return x * x; }
-
-//_____________________________________________________________________
-Alignment::Alignment()
-  : TObject(),
-    fInitialized(kFALSE),
-    fRunNumber(0),
-    fBFieldOn(kFALSE),
-    fRefitStraightTracks(kFALSE),
-    fStartFac(256),
-    fResCutInitial(100),
-    fResCut(100),
-    fMillepede(0L), // to be modified
-    fCluster(0L),
-    fNStdDev(3),
-    fDetElemNumber(0),
-    fTrackRecord(),
-    fTransformCreator(),
-    fGeoCombiTransInverse(),
-    fDoEvaluation(kFALSE),
-    fTrackParamOrig(0),
-    fTrackParamNew(0),
-    fTFile(0),
-    fTTree(0)
-{
-  /// constructor
-  fSigma[0] = 1.5e-1;
-  fSigma[1] = 1.0e-2;
-
-  // default allowed variations
-  fAllowVar[0] = 0.5;  // x
-  fAllowVar[1] = 0.5;  // y
-  fAllowVar[2] = 0.01; // phi_z
-  fAllowVar[3] = 5;    // z
-
-  // initialize millepede
-  fMillepede = new MillePede2();
-  // fMillepede = new o2::align::Mille("theMilleFile.txt"); // To be replaced by MillePede2
-
-  // initialize degrees of freedom
-  // by default all parameters are free
-  for (Int_t iPar = 0; iPar < fNGlobal; ++iPar) {
-    fGlobalParameterStatus[iPar] = kFreeParId;
-  }
-
-  // initialize local equations
-  for (int i = 0; i < fNLocal; ++i) {
-    fLocalDerivatives[i] = 0.0;
-  }
-
-  for (int i = 0; i < fNGlobal; ++i) {
-    fGlobalDerivatives[i] = 0.0;
-  }
-}
-
-//_____________________________________________________________________
-// Alignment::~Alignment()
-//{
-//  /// destructor
-//}
-// Alignment::~Alignment() = default;
-//_____________________________________________________________________
-void Alignment::init(void)
-{
-
-  /// initialize
-  /**
-  initialize millipede
-  must be called after necessary detectors have been fixed,
-  but before constrains are added and before global parameters initial value are set
-  */
-  if (fInitialized) {
-    LOG(fatal) << "Millepede already initialized";
-  }
-
-  // assign proper groupID to free parameters
-  Int_t nGlobal = 0;
-  for (Int_t iPar = 0; iPar < fNGlobal; ++iPar) {
-
-    if (fGlobalParameterStatus[iPar] == kFixedParId) {
-      // fixed parameters are left unchanged
-      continue;
-
-    } else if (fGlobalParameterStatus[iPar] == kFreeParId || fGlobalParameterStatus[iPar] == kGroupBaseId) {
-
-      // free parameters or first element of group are assigned a new group id
-      fGlobalParameterStatus[iPar] = nGlobal++;
-      continue;
-
-    } else if (fGlobalParameterStatus[iPar] < kGroupBaseId) {
-
-      // get detector element id from status, get chamber parameter id
-      const Int_t iDeBase(kGroupBaseId - 1 - fGlobalParameterStatus[iPar]);
-      const Int_t iParBase = iPar % fgNParCh;
-
-      // check
-      if (iDeBase < 0 || iDeBase >= iPar / fgNParCh) {
-        LOG(fatal) << "Group for parameter index " << iPar << " has wrong base detector element: " << iDeBase;
-      }
-
-      // assign identical group id to current
-      fGlobalParameterStatus[iPar] = fGlobalParameterStatus[iDeBase * fgNParCh + iParBase];
-      LOG(info) << "Parameter " << iPar << " grouped to detector " << iDeBase << " (" << GetParameterMaskString(1 << iParBase).Data() << ")";
-
-    } else
-      LOG(fatal) << "Unrecognized parameter status for index " << iPar << ": " << fGlobalParameterStatus[iPar];
-  }
-
-  LOG(info) << "Free Parameters: " << nGlobal << " out of " << fNGlobal;
-
-  // initialize millepede
-  // fMillepede->InitMille(fNGlobal, fNLocal, fNStdDev, fResCut, fResCutInitial, fGlobalParameterStatus);
-  fMillepede->InitMille(fNGlobal, fNLocal, fNStdDev, fResCut, fResCutInitial); // MillePede2 implementation
-
-  fInitialized = kTRUE;
-
-  // some debug output
-  for (Int_t iPar = 0; iPar < fgNParCh; ++iPar) {
-    LOG(info) << "fAllowVar[" << iPar << "]= " << fAllowVar[iPar];
-  }
-
-  // set allowed variations for all parameters
-  for (Int_t iDet = 0; iDet < fgNDetElem; ++iDet) {
-    for (Int_t iPar = 0; iPar < fgNParCh; ++iPar) {
-      fMillepede->SetParSigma(iDet * fgNParCh + iPar, fAllowVar[iPar]);
-    }
-  }
-
-  // Set iterations
-  if (fStartFac > 1) {
-    fMillepede->SetIterations(fStartFac);
-  }
-  // setup monitoring TFile
-  if (fDoEvaluation && fRefitStraightTracks) {
-    fTFile = new TFile("Alignment.root", "RECREATE");
-    fTTree = new TTree("TreeE", "Evaluation");
-
-    const Int_t kSplitlevel = 98;
-    const Int_t kBufsize = 32000;
-
-    fTrackParamOrig = new LocalTrackParam();
-    fTTree->Branch("fTrackParamOrig", "LocalTrackParam", &fTrackParamOrig, kBufsize, kSplitlevel);
-
-    fTrackParamNew = new LocalTrackParam();
-    fTTree->Branch("fTrackParamNew", "LocalTrackParam", &fTrackParamNew, kBufsize, kSplitlevel);
-  }
-}
-
-//_____________________________________________________
-void Alignment::terminate(void)
-{
-  LOG(info) << "Closing Evaluation TFile";
-  if (fTFile && fTTree) {
-    fTFile->cd();
-    fTTree->Write();
-    fTFile->Close();
-  }
-}
-
-//_____________________________________________________
-MillePedeRecord* Alignment::ProcessTrack(Track& track, Bool_t doAlignment, Double_t weight)
-{
-  /// process track for alignment minimization
-  /**
-  returns the alignment records for this track.
-  They can be stored in some output for later reprocessing.
-  */
-
-  // reset track records
-  fTrackRecord.Reset();
-  if (fMillepede->GetRecord()) {
-    fMillepede->GetRecord()->Reset();
-  }
-
-  // loop over clusters to get starting values
-  Bool_t first(kTRUE);
-  // if (!trackParam)
-  // continue;
-  for (auto itTrackParam(track.begin()); itTrackParam != track.end(); ++itTrackParam) {
-
-    // get cluster
-    const Cluster* Cluster = itTrackParam->getClusterPtr();
-    if (!cluster)
-      continue;
-
-    // for first valid cluster, save track position as "starting" values
-    if (first) {
-
-      first = kFALSE;
-      FillTrackParamData(&*itTrackParam);
-      fTrackPos0[0] = fTrackPos[0];
-      fTrackPos0[1] = fTrackPos[1];
-      fTrackPos0[2] = fTrackPos[2];
-      fTrackSlope0[0] = fTrackSlope[0];
-      fTrackSlope0[1] = fTrackSlope[1];
-
-      break;
-    }
-  }
-
-  // redo straight track fit
-  if (fRefitStraightTracks) {
-
-    // refit straight track
-    const LocalTrackParam trackParam(RefitStraightTrack(track, fTrackPos0[2]));
-
-    // fill evaluation tree
-    if (fTrackParamOrig) {
-      fTrackParamOrig->fTrackX = fTrackPos0[0];
-      fTrackParamOrig->fTrackY = fTrackPos0[1];
-      fTrackParamOrig->fTrackZ = fTrackPos0[2];
-      fTrackParamOrig->fTrackSlopeX = fTrackSlope[0];
-      fTrackParamOrig->fTrackSlopeY = fTrackSlope[1];
-    }
-
-    // new ones
-    if (fTrackParamNew) {
-      fTrackParamNew->fTrackX = trackParam.fTrackX;
-      fTrackParamNew->fTrackY = trackParam.fTrackY;
-      fTrackParamNew->fTrackZ = trackParam.fTrackZ;
-      fTrackParamNew->fTrackSlopeX = trackParam.fTrackSlopeX;
-      fTrackParamNew->fTrackSlopeY = trackParam.fTrackSlopeY;
-    }
-
-    if (fTTree)
-      fTTree->Fill();
-
-    /*
-    copy new parameters to stored ones for derivatives calculation
-    this is done only if BFieldOn is false, for which these parameters are used
-    */
-    if (!fBFieldOn) {
-      fTrackPos0[0] = trackParam.fTrackX;
-      fTrackPos0[1] = trackParam.fTrackY;
-      fTrackPos0[2] = trackParam.fTrackZ;
-      fTrackSlope[0] = trackParam.fTrackSlopeX;
-      fTrackSlope[1] = trackParam.fTrackSlopeY;
-    }
-  }
-
-  // second loop to perform alignment
-  for (auto itTrackParam(track.begin()); itTrackParam != track.end(); ++itTrackParam) {
-
-    // get track parameters
-    if (!&*itTrackParam)
-      continue;
-
-    // get cluster
-    const Cluster* cluster = itTrackParam->getClusterPtr();
-    if (!cluster)
-      continue;
-
-    // fill local variables for this position --> one measurement
-    FillDetElemData(cluster);
-    FillRecPointData(cluster);
-    FillTrackParamData(&*itTrackParam);
-
-    // 'inverse' (GlobalToLocal) rotation matrix
-    const Double_t* r(fGeoCombiTransInverse.GetRotationMatrix());
-
-    // calculate measurements
-    if (fBFieldOn) {
-
-      // use residuals (cluster - track) for measurement
-      fMeas[0] = r[0] * (fClustPos[0] - fTrackPos[0]) + r[1] * (fClustPos[1] - fTrackPos[1]);
-      fMeas[1] = r[3] * (fClustPos[0] - fTrackPos[0]) + r[4] * (fClustPos[1] - fTrackPos[1]);
-
-    } else {
-
-      // use cluster position for measurement
-      fMeas[0] = (r[0] * fClustPos[0] + r[1] * fClustPos[1]);
-      fMeas[1] = (r[3] * fClustPos[0] + r[4] * fClustPos[1]);
-    }
-
-    // Set local equations
-    LocalEquationX();
-    LocalEquationY();
-  }
-
-  // copy track record
-  fMillepede->SetRecordRun(fRunNumber);
-  fMillepede->SetRecordWeight(weight);
-  fTrackRecord = *fMillepede->GetRecord();
-
-  // save record data
-  if (doAlignment) {
-    fMillepede->SaveRecordData();
-    fMillepede->CloseDataRecStorage();
-  }
-
-  // return record
-  return &fTrackRecord;
-}
-
-//______________________________________________________________________________
-void Alignment::ProcessTrack(MillePedeRecord* trackRecord)
-{
-  LOG(fatal) << __PRETTY_FUNCTION__ << " is disabled";
-
-  /// process track record
-  if (!trackRecord)
-    return;
-
-  // // make sure record storage is initialized
-  if (!fMillepede->GetRecord()) {
-    fMillepede->InitDataRecStorage(kFalse);
-  }
-  // // copy content
-  *fMillepede->GetRecord() = *trackRecord;
-
-  // save record
-  fMillepede->SaveRecordData();
-  // write to local file
-  fMillepede->CloseDataRecStorage();
-
-  return;
-}
-
-//_____________________________________________________________________
-void Alignment::FixAll(UInt_t mask)
-{
-  /// fix parameters matching mask, for all chambers
-  LOG(info) << "Fixing " << GetParameterMaskString(mask).Data() << " for all detector elements";
-
-  // fix all stations
-  for (Int_t i = 0; i < fgNDetElem; ++i) {
-    if (mask & ParX)
-      FixParameter(i, 0);
-    if (mask & ParY)
-      FixParameter(i, 1);
-    if (mask & ParTZ)
-      FixParameter(i, 2);
-    if (mask & ParZ)
-      FixParameter(i, 3);
-  }
-}
-
-//_____________________________________________________________________
-void Alignment::FixChamber(Int_t iCh, UInt_t mask)
-{
-  /// fix parameters matching mask, for all detector elements in a given chamber, counting from 1
-
-  // check boundaries
-  if (iCh < 1 || iCh > 10) {
-    LOG(fatal) << "Invalid chamber index " << iCh;
-  }
-
-  // get first and last element
-  const Int_t iDetElemFirst = fgSNDetElemCh[iCh - 1];
-  const Int_t iDetElemLast = fgSNDetElemCh[iCh];
-  for (Int_t i = iDetElemFirst; i < iDetElemLast; ++i) {
-
-    LOG(info) << "Fixing " << GetParameterMaskString(mask).Data() << " for detector element " << i;
-
-    if (mask & ParX)
-      FixParameter(i, 0);
-    if (mask & ParY)
-      FixParameter(i, 1);
-    if (mask & ParTZ)
-      FixParameter(i, 2);
-    if (mask & ParZ)
-      FixParameter(i, 3);
-  }
-}
-
-//_____________________________________________________________________
-void Alignment::FixDetElem(Int_t iDetElemId, UInt_t mask)
-{
-  /// fix parameters matching mask, for a given detector element, counting from 0
-  const Int_t iDet(GetDetElemNumber(iDetElemId));
-  if (mask & ParX)
-    FixParameter(iDet, 0);
-  if (mask & ParY)
-    FixParameter(iDet, 1);
-  if (mask & ParTZ)
-    FixParameter(iDet, 2);
-  if (mask & ParZ)
-    FixParameter(iDet, 3);
-}
-
-//_____________________________________________________________________
-void Alignment::FixHalfSpectrometer(const Bool_t* lChOnOff, UInt_t sidesMask, UInt_t mask)
-{
-
-  /// Fix parameters matching mask for all detectors in selected chambers and selected sides of the spectrometer
-  for (Int_t i = 0; i < fgNDetElem; ++i) {
-
-    // get chamber matching detector
-    const Int_t iCh(GetChamberId(i));
-    if (!lChOnOff[iCh - 1])
-      continue;
-
-    // get detector element in chamber
-    Int_t lDetElemNumber = i - fgSNDetElemCh[iCh - 1];
-
-    // skip detector if its side is off
-    // stations 1 and 2
-    if (iCh >= 1 && iCh <= 4) {
-      if (lDetElemNumber == 0 && !(sidesMask & SideTopRight))
-        continue;
-      if (lDetElemNumber == 1 && !(sidesMask & SideTopLeft))
-        continue;
-      if (lDetElemNumber == 2 && !(sidesMask & SideBottomLeft))
-        continue;
-      if (lDetElemNumber == 3 && !(sidesMask & SideBottomRight))
-        continue;
-    }
-
-    // station 3
-    if (iCh >= 5 && iCh <= 6) {
-      if (lDetElemNumber >= 0 && lDetElemNumber <= 4 && !(sidesMask & SideTopRight))
-        continue;
-      if (lDetElemNumber >= 5 && lDetElemNumber <= 10 && !(sidesMask & SideTopLeft))
-        continue;
-      if (lDetElemNumber >= 11 && lDetElemNumber <= 13 && !(sidesMask & SideBottomLeft))
-        continue;
-      if (lDetElemNumber >= 14 && lDetElemNumber <= 17 && !(sidesMask & SideBottomRight))
-        continue;
-    }
-
-    // stations 4 and 5
-    if (iCh >= 7 && iCh <= 10) {
-      if (lDetElemNumber >= 0 && lDetElemNumber <= 6 && !(sidesMask & SideTopRight))
-        continue;
-      if (lDetElemNumber >= 7 && lDetElemNumber <= 13 && !(sidesMask & SideTopLeft))
-        continue;
-      if (lDetElemNumber >= 14 && lDetElemNumber <= 19 && !(sidesMask & SideBottomLeft))
-        continue;
-      if (lDetElemNumber >= 20 && lDetElemNumber <= 25 && !(sidesMask & SideBottomRight))
-        continue;
-    }
-
-    // detector is accepted, fix it
-    FixDetElem(i, mask);
-  }
-}
-
-//______________________________________________________________________
-void Alignment::FixParameter(Int_t iPar)
-{
-
-  /// fix a given parameter, counting from 0
-  if (fInitialized) {
-    LOG(fatal) << "Millepede already initialized";
-  }
-
-  fGlobalParameterStatus[iPar] = kFixedParId;
-}
-
-//_____________________________________________________________________
-void Alignment::ReleaseChamber(Int_t iCh, UInt_t mask)
-{
-  /// release parameters matching mask, for all detector elements in a given chamber, counting from 1
-
-  // check boundaries
-  if (iCh < 1 || iCh > 10) {
-    LOG(fatal) << "Invalid chamber index " << iCh;
-  }
-
-  // get first and last element
-  const Int_t iDetElemFirst = fgSNDetElemCh[iCh - 1];
-  const Int_t iDetElemLast = fgSNDetElemCh[iCh];
-  for (Int_t i = iDetElemFirst; i < iDetElemLast; ++i) {
-
-    LOG(info) << "Releasing " << GetParameterMaskString(mask).Data() << " for detector element " << i;
-
-    if (mask & ParX)
-      ReleaseParameter(i, 0);
-    if (mask & ParY)
-      ReleaseParameter(i, 1);
-    if (mask & ParTZ)
-      ReleaseParameter(i, 2);
-    if (mask & ParZ)
-      ReleaseParameter(i, 3);
-  }
-}
-
-//_____________________________________________________________________
-void Alignment::ReleaseDetElem(Int_t iDetElemId, UInt_t mask)
-{
-  /// release parameters matching mask, for a given detector element, counting from 0
-  const Int_t iDet(GetDetElemNumber(iDetElemId));
-  if (mask & ParX)
-    ReleaseParameter(iDet, 0);
-  if (mask & ParY)
-    ReleaseParameter(iDet, 1);
-  if (mask & ParTZ)
-    ReleaseParameter(iDet, 2);
-  if (mask & ParZ)
-    ReleaseParameter(iDet, 3);
-}
-
-//______________________________________________________________________
-void Alignment::ReleaseParameter(Int_t iPar)
-{
-
-  /// release a given parameter, counting from 0
-  if (fInitialized) {
-    LOG(fatal) << "Millepede already initialized";
-  }
-
-  fGlobalParameterStatus[iPar] = kFreeParId;
-}
-
-//_____________________________________________________________________
-void Alignment::GroupChamber(Int_t iCh, UInt_t mask)
-{
-  /// group parameters matching mask for all detector elements in a given chamber, counting from 1
-  if (iCh < 1 || iCh > fgNCh) {
-    LOG(fatal) << "Invalid chamber index " << iCh;
-  }
-
-  const Int_t detElemMin = 100 * iCh;
-  const Int_t detElemMax = 100 * iCh + fgNDetElemCh[iCh] - 1;
-  GroupDetElems(detElemMin, detElemMax, mask);
-}
-
-//_____________________________________________________________________
-void Alignment::GroupHalfChamber(Int_t iCh, Int_t iHalf, UInt_t mask)
-{
-  /// group parameters matching mask for all detector elements in a given tracking module (= half chamber), counting from 0
-  if (iCh < 1 || iCh > fgNCh) {
-    LOG(fatal) << "Invalid chamber index " << iCh;
-  }
-
-  if (iHalf < 0 || iHalf > 1) {
-    LOG(fatal) << "Invalid half chamber index " << iHalf;
-  }
-
-  const Int_t iHalfCh = 2 * (iCh - 1) + iHalf;
-  GroupDetElems(&fgDetElemHalfCh[iHalfCh][0], fgNDetElemHalfCh[iHalfCh], mask);
-}
-
-//_____________________________________________________________________
-void Alignment::GroupDetElems(Int_t detElemMin, Int_t detElemMax, UInt_t mask)
-{
-  /// group parameters matching mask for all detector elements between min and max
-  // check number of detector elements
-  const Int_t nDetElem = detElemMax - detElemMin + 1;
-  if (nDetElem < 2) {
-    LOG(fatal) << "Requested group of DEs " << detElemMin << "-" << detElemMax << " contains less than 2 DE's";
-  }
-
-  // create list
-  Int_t* detElemList = new int[nDetElem];
-  for (Int_t i = 0; i < nDetElem; ++i) {
-    detElemList[i] = detElemMin + i;
-  }
-
-  // group
-  GroupDetElems(detElemList, nDetElem, mask);
-  delete[] detElemList;
-}
-
-//_____________________________________________________________________
-void Alignment::GroupDetElems(const Int_t* detElemList, Int_t nDetElem, UInt_t mask)
-{
-  /// group parameters matching mask for all detector elements in list
-  if (fInitialized) {
-    LOG(fatal) << "Millepede already initialized";
-  }
-
-  const Int_t iDeBase(GetDetElemNumber(detElemList[0]));
-  for (Int_t i = 0; i < nDetElem; ++i) {
-    const Int_t iDeCurrent(GetDetElemNumber(detElemList[i]));
-    if (mask & ParX)
-      fGlobalParameterStatus[iDeCurrent * fgNParCh + 0] = (i == 0) ? kGroupBaseId : (kGroupBaseId - iDeBase - 1);
-    if (mask & ParY)
-      fGlobalParameterStatus[iDeCurrent * fgNParCh + 1] = (i == 0) ? kGroupBaseId : (kGroupBaseId - iDeBase - 1);
-    if (mask & ParTZ)
-      fGlobalParameterStatus[iDeCurrent * fgNParCh + 2] = (i == 0) ? kGroupBaseId : (kGroupBaseId - iDeBase - 1);
-    if (mask & ParZ)
-      fGlobalParameterStatus[iDeCurrent * fgNParCh + 3] = (i == 0) ? kGroupBaseId : (kGroupBaseId - iDeBase - 1);
-
-    if (i == 0)
-      LOG(info) << "Creating new group for detector " << detElemList[i] << " and variable " << GetParameterMaskString(mask).Data();
-    else
-      LOG(info) << "Adding detector element " << detElemList[i] << " to current group";
-  }
-}
-
-//______________________________________________________________________
-void Alignment::SetChamberNonLinear(Int_t iCh, UInt_t mask)
-{
-  /// Set parameters matching mask as non linear, for all detector elements in a given chamber, counting from 1
-  const Int_t iDetElemFirst = fgSNDetElemCh[iCh - 1];
-  const Int_t iDetElemLast = fgSNDetElemCh[iCh];
-  for (Int_t i = iDetElemFirst; i < iDetElemLast; ++i) {
-
-    if (mask & ParX)
-      SetParameterNonLinear(i, 0);
-    if (mask & ParY)
-      SetParameterNonLinear(i, 1);
-    if (mask & ParTZ)
-      SetParameterNonLinear(i, 2);
-    if (mask & ParZ)
-      SetParameterNonLinear(i, 3);
-  }
-}
-
-//_____________________________________________________________________
-void Alignment::SetDetElemNonLinear(Int_t iDetElemId, UInt_t mask)
-{
-  /// Set parameters matching mask as non linear, for a given detector element, counting from 0
-  const Int_t iDet(GetDetElemNumber(iDetElemId));
-  if (mask & ParX)
-    SetParameterNonLinear(iDet, 0);
-  if (mask & ParY)
-    SetParameterNonLinear(iDet, 1);
-  if (mask & ParTZ)
-    SetParameterNonLinear(iDet, 2);
-  if (mask & ParZ)
-    SetParameterNonLinear(iDet, 3);
-}
-
-//______________________________________________________________________
-void Alignment::SetParameterNonLinear(Int_t iPar)
-{
-  /// Set nonlinear flag for parameter iPar
-  if (!fInitialized) {
-    LOG(fatal) << "Millepede not initialized";
-  }
-
-  fMillepede->SetNonLinear(iPar);
-  LOG(info) << "Parameter " << iPar << " set to non linear ";
-}
-
-//______________________________________________________________________
-void Alignment::AddConstraints(const Bool_t* lChOnOff, UInt_t mask)
-{
-  /// Add constraint equations for selected chambers and degrees of freedom
-
-  Array fConstraintX;
-  Array fConstraintY;
-  Array fConstraintTZ;
-  Array fConstraintZ;
-
-  for (Int_t i = 0; i < fgNDetElem; ++i) {
-
-    // get chamber matching detector
-    const Int_t iCh(GetChamberId(i));
-    if (lChOnOff[iCh - 1]) {
-
-      if (mask & ParX)
-        fConstraintX.values[i * fgNParCh + 0] = 1.0;
-      if (mask & ParY)
-        fConstraintY.values[i * fgNParCh + 1] = 1.0;
-      if (mask & ParTZ)
-        fConstraintTZ.values[i * fgNParCh + 2] = 1.0;
-      if (mask & ParZ)
-        fConstraintTZ.values[i * fgNParCh + 3] = 1.0;
-    }
-  }
-
-  if (mask & ParX)
-    AddConstraint(fConstraintX.values, 0.0);
-  if (mask & ParY)
-    AddConstraint(fConstraintY.values, 0.0);
-  if (mask & ParTZ)
-    AddConstraint(fConstraintTZ.values, 0.0);
-  if (mask & ParZ)
-    AddConstraint(fConstraintZ.values, 0.0);
-}
-
-//______________________________________________________________________
-void Alignment::AddConstraints(const Bool_t* lChOnOff, const Bool_t* lVarXYT, UInt_t sidesMask)
-{
-  /*
-  questions:
-  - is there not redundancy/inconsistency between lDetTLBR and lSpecLROnOff ? shouldn't we use only lDetTLBR ?
-  - why is weight ignored for ConstrainT and ConstrainB
-  - why is there no constrain on z
-  */
-
-  /// Add constraint equations for selected chambers, degrees of freedom and detector half
-  Double_t lMeanY = 0.;
-  Double_t lSigmaY = 0.;
-  Double_t lMeanZ = 0.;
-  Double_t lSigmaZ = 0.;
-  Int_t lNDetElem = 0;
-
-  for (Int_t i = 0; i < fgNDetElem; ++i) {
-
-    // get chamber matching detector
-    const Int_t iCh(GetChamberId(i));
-
-    // skip detector if chamber is off
-    if (lChOnOff[iCh - 1])
-      continue;
-
-    // get detector element id from detector element number
-    const Int_t lDetElemNumber = i - fgSNDetElemCh[iCh - 1];
-    const Int_t lDetElemId = iCh * 100 + lDetElemNumber;
-
-    // skip detector if its side is off
-    // stations 1 and 2
-    if (iCh >= 1 && iCh <= 4) {
-      if (lDetElemNumber == 0 && !(sidesMask & SideTopRight))
-        continue;
-      if (lDetElemNumber == 1 && !(sidesMask & SideTopLeft))
-        continue;
-      if (lDetElemNumber == 2 && !(sidesMask & SideBottomLeft))
-        continue;
-      if (lDetElemNumber == 3 && !(sidesMask & SideBottomRight))
-        continue;
-    }
-
-    // station 3
-    if (iCh >= 5 && iCh <= 6) {
-      if (lDetElemNumber >= 0 && lDetElemNumber <= 4 && !(sidesMask & SideTopRight))
-        continue;
-      if (lDetElemNumber >= 5 && lDetElemNumber <= 10 && !(sidesMask & SideTopLeft))
-        continue;
-      if (lDetElemNumber >= 11 && lDetElemNumber <= 13 && !(sidesMask & SideBottomLeft))
-        continue;
-      if (lDetElemNumber >= 14 && lDetElemNumber <= 17 && !(sidesMask & SideBottomRight))
-        continue;
-    }
-
-    // stations 4 and 5
-    if (iCh >= 7 && iCh <= 10) {
-      if (lDetElemNumber >= 0 && lDetElemNumber <= 6 && !(sidesMask & SideTopRight))
-        continue;
-      if (lDetElemNumber >= 7 && lDetElemNumber <= 13 && !(sidesMask & SideTopLeft))
-        continue;
-      if (lDetElemNumber >= 14 && lDetElemNumber <= 19 && !(sidesMask & SideBottomLeft))
-        continue;
-      if (lDetElemNumber >= 20 && lDetElemNumber <= 25 && !(sidesMask & SideBottomRight))
-        continue;
-    }
-
-    // get global x, y and z position
-    Double_t lDetElemGloX = 0.;
-    Double_t lDetElemGloY = 0.;
-    Double_t lDetElemGloZ = 0.;
-
-    auto fTransform = fTransformCreator(lDetElemId);
-    o2::math_utils::Point3D<double> SlatPos{0.0, 0.0, 0.0};
-    o2::math_utils::Point3D<double> GlobalPos;
-
-    fTransform.LocalToMaster(SlatPos, GlobalPos);
-    lDetElemGloX = GlobalPos.x();
-    lDetElemGloY = GlobalPos.y();
-    lDetElemGloZ = GlobalPos.z();
-    // fTransform->Local2Global(lDetElemId, 0, 0, 0, lDetElemGloX, lDetElemGloY, lDetElemGloZ);
-
-    // increment mean Y, mean Z, sigmas and number of accepted detectors
-    lMeanY += lDetElemGloY;
-    lSigmaY += lDetElemGloY * lDetElemGloY;
-    lMeanZ += lDetElemGloZ;
-    lSigmaZ += lDetElemGloZ * lDetElemGloZ;
-    lNDetElem++;
-  }
-
-  // calculate mean values
-  lMeanY /= lNDetElem;
-  lSigmaY /= lNDetElem;
-  lSigmaY = TMath::Sqrt(lSigmaY - lMeanY * lMeanY);
-  lMeanZ /= lNDetElem;
-  lSigmaZ /= lNDetElem;
-  lSigmaZ = TMath::Sqrt(lSigmaZ - lMeanZ * lMeanZ);
-  LOG(info) << "Used " << lNDetElem << " DetElem, MeanZ= " << lMeanZ << ", SigmaZ= " << lSigmaZ;
-
-  // create all possible arrays
-  Array fConstraintX[4];  // Array for constraint equation X
-  Array fConstraintY[4];  // Array for constraint equation Y
-  Array fConstraintP[4];  // Array for constraint equation P
-  Array fConstraintXZ[4]; // Array for constraint equation X vs Z
-  Array fConstraintYZ[4]; // Array for constraint equation Y vs Z
-  Array fConstraintPZ[4]; // Array for constraint equation P vs Z
-
-  // do we really need these ?
-  Array fConstraintXY[4]; // Array for constraint equation X vs Y
-  Array fConstraintYY[4]; // Array for constraint equation Y vs Y
-  Array fConstraintPY[4]; // Array for constraint equation P vs Y
-
-  // fill Bool_t sides array based on masks, for convenience
-  Bool_t lDetTLBR[4];
-  lDetTLBR[0] = sidesMask & SideTop;
-  lDetTLBR[1] = sidesMask & SideLeft;
-  lDetTLBR[2] = sidesMask & SideBottom;
-  lDetTLBR[3] = sidesMask & SideRight;
-
-  for (Int_t i = 0; i < fgNDetElem; ++i) {
-
-    // get chamber matching detector
-    const Int_t iCh(GetChamberId(i));
-
-    // skip detector if chamber is off
-    if (!lChOnOff[iCh - 1])
-      continue;
-
-    // get detector element id from detector element number
-    const Int_t lDetElemNumber = i - fgSNDetElemCh[iCh - 1];
-    const Int_t lDetElemId = iCh * 100 + lDetElemNumber;
-
-    // get global x, y and z position
-    Double_t lDetElemGloX = 0.;
-    Double_t lDetElemGloY = 0.;
-    Double_t lDetElemGloZ = 0.;
-
-    auto fTransform = fTransformCreator(lDetElemId);
-    o2::math_utils::Point3D<double> SlatPos{0.0, 0.0, 0.0};
-    o2::math_utils::Point3D<double> GlobalPos;
-
-    fTransform.LocalToMaster(SlatPos, GlobalPos);
-    lDetElemGloX = GlobalPos.x();
-    lDetElemGloY = GlobalPos.y();
-    lDetElemGloZ = GlobalPos.z();
-    // fTransform->Local2Global(lDetElemId, 0, 0, 0, lDetElemGloX, lDetElemGloY, lDetElemGloZ);
-
-    // loop over sides
-    for (Int_t iSide = 0; iSide < 4; iSide++) {
-
-      // skip if side is not selected
-      if (!lDetTLBR[iSide])
-        continue;
-
-      // skip detector if it is not in the selected side
-      // stations 1 and 2
-      if (iCh >= 1 && iCh <= 4) {
-        if (lDetElemNumber == 0 && !(iSide == 0 || iSide == 3))
-          continue; // top-right
-        if (lDetElemNumber == 1 && !(iSide == 0 || iSide == 1))
-          continue; // top-left
-        if (lDetElemNumber == 2 && !(iSide == 2 || iSide == 1))
-          continue; // bottom-left
-        if (lDetElemNumber == 3 && !(iSide == 2 || iSide == 3))
-          continue; // bottom-right
-      }
-
-      // station 3
-      if (iCh >= 5 && iCh <= 6) {
-        if (lDetElemNumber >= 0 && lDetElemNumber <= 4 && !(iSide == 0 || iSide == 3))
-          continue; // top-right
-        if (lDetElemNumber >= 5 && lDetElemNumber <= 9 && !(iSide == 0 || iSide == 1))
-          continue; // top-left
-        if (lDetElemNumber >= 10 && lDetElemNumber <= 13 && !(iSide == 2 || iSide == 1))
-          continue; // bottom-left
-        if (lDetElemNumber >= 14 && lDetElemNumber <= 17 && !(iSide == 2 || iSide == 3))
-          continue; // bottom-right
-      }
-
-      // stations 4 and 5
-      if (iCh >= 7 && iCh <= 10) {
-        if (lDetElemNumber >= 0 && lDetElemNumber <= 6 && !(iSide == 0 || iSide == 3))
-          continue; // top-right
-        if (lDetElemNumber >= 7 && lDetElemNumber <= 13 && !(iSide == 0 || iSide == 1))
-          continue; // top-left
-        if (lDetElemNumber >= 14 && lDetElemNumber <= 19 && !(iSide == 2 || iSide == 1))
-          continue; // bottom-left
-        if (lDetElemNumber >= 20 && lDetElemNumber <= 25 && !(iSide == 2 || iSide == 3))
-          continue; // bottom-right
-      }
-
-      // constrain x
-      if (lVarXYT[0])
-        fConstraintX[iSide].values[i * fgNParCh + 0] = 1;
-
-      // constrain y
-      if (lVarXYT[1])
-        fConstraintY[iSide].values[i * fgNParCh + 1] = 1;
-
-      // constrain phi (rotation around z)
-      if (lVarXYT[2])
-        fConstraintP[iSide].values[i * fgNParCh + 2] = 1;
-
-      // x-z shearing
-      if (lVarXYT[3])
-        fConstraintXZ[iSide].values[i * fgNParCh + 0] = (lDetElemGloZ - lMeanZ) / lSigmaZ;
-
-      // y-z shearing
-      if (lVarXYT[4])
-        fConstraintYZ[iSide].values[i * fgNParCh + 1] = (lDetElemGloZ - lMeanZ) / lSigmaZ;
-
-      // phi-z shearing
-      if (lVarXYT[5])
-        fConstraintPZ[iSide].values[i * fgNParCh + 2] = (lDetElemGloZ - lMeanZ) / lSigmaZ;
-
-      // x-y shearing
-      if (lVarXYT[6])
-        fConstraintXY[iSide].values[i * fgNParCh + 0] = (lDetElemGloY - lMeanY) / lSigmaY;
-
-      // y-y shearing
-      if (lVarXYT[7])
-        fConstraintYY[iSide].values[i * fgNParCh + 1] = (lDetElemGloY - lMeanY) / lSigmaY;
-
-      // phi-y shearing
-      if (lVarXYT[8])
-        fConstraintPY[iSide].values[i * fgNParCh + 2] = (lDetElemGloY - lMeanY) / lSigmaY;
-    }
-  }
-
-  // pass constraints to millepede
-  for (Int_t iSide = 0; iSide < 4; iSide++) {
-    // skip if side is not selected
-    if (!lDetTLBR[iSide])
-      continue;
-
-    if (lVarXYT[0])
-      AddConstraint(fConstraintX[iSide].values, 0.0);
-    if (lVarXYT[1])
-      AddConstraint(fConstraintY[iSide].values, 0.0);
-    if (lVarXYT[2])
-      AddConstraint(fConstraintP[iSide].values, 0.0);
-    if (lVarXYT[3])
-      AddConstraint(fConstraintXZ[iSide].values, 0.0);
-    if (lVarXYT[4])
-      AddConstraint(fConstraintYZ[iSide].values, 0.0);
-    if (lVarXYT[5])
-      AddConstraint(fConstraintPZ[iSide].values, 0.0);
-    if (lVarXYT[6])
-      AddConstraint(fConstraintXY[iSide].values, 0.0);
-    if (lVarXYT[7])
-      AddConstraint(fConstraintYY[iSide].values, 0.0);
-    if (lVarXYT[8])
-      AddConstraint(fConstraintPY[iSide].values, 0.0);
-  }
-}
-
-//______________________________________________________________________
-void Alignment::InitGlobalParameters(Double_t* par)
-{
-  /// Initialize global parameters with par array
-  if (!fInitialized) {
-    LOG(fatal) << "Millepede is not initialized";
-  }
-
-  fMillepede->SetGlobalParameters(par);
-}
-
-//______________________________________________________________________
-void Alignment::SetAllowedVariation(Int_t iPar, Double_t value)
-{
-  /// "Encouraged" variation for degrees of freedom
-  // check initialization
-  if (fInitialized) {
-    LOG(fatal) << "Millepede already initialized";
-  }
-
-  // check initialization
-  if (!(iPar >= 0 && iPar < fgNParCh)) {
-    LOG(fatal) << "Invalid index: " << iPar;
-  }
-
-  fAllowVar[iPar] = value;
-}
-
-//______________________________________________________________________
-void Alignment::SetSigmaXY(Double_t sigmaX, Double_t sigmaY)
-{
-
-  /// Set expected measurement resolution
-  fSigma[0] = sigmaX;
-  fSigma[1] = sigmaY;
-
-  // print
-  for (Int_t i = 0; i < 2; ++i) {
-    LOG(info) << "fSigma[" << i << "] =" << fSigma[i];
-  }
-}
-
-//_____________________________________________________
-void Alignment::GlobalFit(Double_t* parameters, Double_t* errors, Double_t* pulls)
-{
-
-  /// Call global fit; Global parameters are stored in parameters
-  fMillepede->GlobalFit(parameters, errors, pulls);
-
-  LOG(info) << "Done fitting global parameters";
-  for (int iDet = 0; iDet < fgNDetElem; ++iDet) {
-    LOG(info) << iDet << " " << parameters[iDet * fgNParCh + 0] << " " << parameters[iDet * fgNParCh + 1] << " " << parameters[iDet * fgNParCh + 3] << " " << parameters[iDet * fgNParCh + 2];
-  }
-}
-
-//_____________________________________________________
-void Alignment::PrintGlobalParameters() const
-{
-  fMillepede->PrintGlobalParameters();
-}
-
-//_____________________________________________________
-Double_t Alignment::GetParError(Int_t iPar) const
-{
-  return fMillepede->GetParError(iPar);
-}
-
-// //______________________________________________________________________
-// AliMUONGeometryTransformer* Alignment::ReAlign(
-//   const AliMUONGeometryTransformer* transformer,
-//   const double* misAlignments, Bool_t)
-// {
-
-//   /// Returns a new AliMUONGeometryTransformer with the found misalignments
-//   /// applied.
-
-//   // Takes the internal geometry module transformers, copies them
-//   // and gets the Detection Elements from them.
-//   // Takes misalignment parameters and applies these
-//   // to the local transform of the Detection Element
-//   // Obtains the global transform by multiplying the module transformer
-//   // transformation with the local transformation
-//   // Applies the global transform to a new detection element
-//   // Adds the new detection element to a new module transformer
-//   // Adds the new module transformer to a new geometry transformer
-//   // Returns the new geometry transformer
-
-//   Double_t lModuleMisAlignment[fgNParCh] = {0};
-//   Double_t lDetElemMisAlignment[fgNParCh] = {0};
-//   const TClonesArray* oldMisAlignArray(transformer->GetMisAlignmentData());
-
-//   AliMUONGeometryTransformer* newGeometryTransformer = new AliMUONGeometryTransformer();
-//   for (Int_t iMt = 0; iMt < transformer->GetNofModuleTransformers(); ++iMt) {
-
-//     // module transformers
-//     const AliMUONGeometryModuleTransformer* kModuleTransformer = transformer->GetModuleTransformer(iMt, kTRUE);
-
-//     AliMUONGeometryModuleTransformer* newModuleTransformer = new AliMUONGeometryModuleTransformer(iMt);
-//     newGeometryTransformer->AddModuleTransformer(newModuleTransformer);
-
-//     // get transformation
-//     TGeoHMatrix deltaModuleTransform(DeltaTransform(lModuleMisAlignment));
-
-//     // update module
-//     TGeoHMatrix moduleTransform(*kModuleTransformer->GetTransformation());
-//     TGeoHMatrix newModuleTransform(AliMUONGeometryBuilder::Multiply(deltaModuleTransform, moduleTransform));
-//     newModuleTransformer->SetTransformation(newModuleTransform);
-
-//     // Get matching old alignment and update current matrix accordingly
-//     if (oldMisAlignArray) {
-
-//       const AliAlignObjMatrix* oldAlignObj(0);
-//       const Int_t moduleId(kModuleTransformer->GetModuleId());
-//       const Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, moduleId);
-//       for (Int_t pos = 0; pos < oldMisAlignArray->GetEntriesFast(); ++pos) {
-
-//         const AliAlignObjMatrix* localAlignObj(dynamic_cast<const AliAlignObjMatrix*>(oldMisAlignArray->At(pos)));
-//         if (localAlignObj && localAlignObj->GetVolUID() == volId) {
-//           oldAlignObj = localAlignObj;
-//           break;
-//         }
-//       }
-
-//       // multiply
-//       if (oldAlignObj) {
-
-//         TGeoHMatrix oldMatrix;
-//         oldAlignObj->GetMatrix(oldMatrix);
-//         deltaModuleTransform.Multiply(&oldMatrix);
-//       }
-//     }
-
-//     // Create module mis alignment matrix
-//     newGeometryTransformer->AddMisAlignModule(kModuleTransformer->GetModuleId(), deltaModuleTransform);
-
-//     AliMpExMap* detElements = kModuleTransformer->GetDetElementStore();
-
-//     TIter next(detElements->CreateIterator());
-//     AliMUONGeometryDetElement* detElement;
-//     Int_t iDe(-1);
-//     while ((detElement = static_cast<AliMUONGeometryDetElement*>(next()))) {
-//       ++iDe;
-//       // make a new detection element
-//       AliMUONGeometryDetElement* newDetElement = new AliMUONGeometryDetElement(detElement->GetId(), detElement->GetVolumePath());
-//       TString lDetElemName(detElement->GetDEName());
-//       lDetElemName.ReplaceAll("DE", "");
-
-//       // store detector element id and number
-//       const Int_t iDetElemId = lDetElemName.Atoi();
-//       if (DetElemIsValid(iDetElemId)) {
-
-//         const Int_t iDetElemNumber(GetDetElemNumber(iDetElemId));
-
-//         for (int i = 0; i < fgNParCh; ++i) {
-//           lDetElemMisAlignment[i] = 0.0;
-//           if (iMt < fgNTrkMod) {
-//             lDetElemMisAlignment[i] = misAlignments[iDetElemNumber * fgNParCh + i];
-//           }
-//         }
-
-//         // get transformation
-//         TGeoHMatrix deltaGlobalTransform(DeltaTransform(lDetElemMisAlignment));
-
-//         // update module
-//         TGeoHMatrix globalTransform(*detElement->GetGlobalTransformation());
-//         TGeoHMatrix newGlobalTransform(AliMUONGeometryBuilder::Multiply(deltaGlobalTransform, globalTransform));
-//         newDetElement->SetGlobalTransformation(newGlobalTransform);
-//         newModuleTransformer->GetDetElementStore()->Add(newDetElement->GetId(), newDetElement);
-
-//         // Get matching old alignment and update current matrix accordingly
-//         if (oldMisAlignArray) {
-
-//           const AliAlignObjMatrix* oldAlignObj(0);
-//           const int detElemId(detElement->GetId());
-//           const Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, detElemId);
-//           for (Int_t pos = 0; pos < oldMisAlignArray->GetEntriesFast(); ++pos) {
-
-//             const AliAlignObjMatrix* localAlignObj(dynamic_cast<const AliAlignObjMatrix*>(oldMisAlignArray->At(pos)));
-//             if (localAlignObj && localAlignObj->GetVolUID() == volId) {
-//               oldAlignObj = localAlignObj;
-//               break;
-//             }
-//           }
-
-//           // multiply
-//           if (oldAlignObj) {
-
-//             TGeoHMatrix oldMatrix;
-//             oldAlignObj->GetMatrix(oldMatrix);
-//             deltaGlobalTransform.Multiply(&oldMatrix);
-//           }
-//         }
-
-//         // Create misalignment matrix
-//         newGeometryTransformer->AddMisAlignDetElement(detElement->GetId(), deltaGlobalTransform);
-
-//       } else {
-
-//         // "invalid" detector elements come from MTR and are left unchanged
-//         Aliinfo(Form("Keeping detElement %i unchanged", iDetElemId));
-
-//         // update module
-//         TGeoHMatrix globalTransform(*detElement->GetGlobalTransformation());
-//         newDetElement->SetGlobalTransformation(globalTransform);
-//         newModuleTransformer->GetDetElementStore()->Add(newDetElement->GetId(), newDetElement);
-
-//         // Get matching old alignment and update current matrix accordingly
-//         if (oldMisAlignArray) {
-
-//           const AliAlignObjMatrix* oldAlignObj(0);
-//           const int detElemId(detElement->GetId());
-//           const Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, detElemId);
-//           for (Int_t pos = 0; pos < oldMisAlignArray->GetEntriesFast(); ++pos) {
-
-//             const AliAlignObjMatrix* localAlignObj(dynamic_cast<const AliAlignObjMatrix*>(oldMisAlignArray->At(pos)));
-//             if (localAlignObj && localAlignObj->GetVolUID() == volId) {
-//               oldAlignObj = localAlignObj;
-//               break;
-//             }
-//           }
-
-//           // multiply
-//           if (oldAlignObj) {
-
-//             TGeoHMatrix oldMatrix;
-//             oldAlignObj->GetMatrix(oldMatrix);
-//             newGeometryTransformer->AddMisAlignDetElement(detElement->GetId(), oldMatrix);
-//           }
-//         }
-//       }
-//     }
-
-//     newGeometryTransformer->AddModuleTransformer(newModuleTransformer);
-//   }
-
-//   return newGeometryTransformer;
-// }
-
-//______________________________________________________________________
-void Alignment::SetAlignmentResolution(const TClonesArray* misAlignArray, Int_t rChId, Double_t chResX, Double_t chResY, Double_t deResX, Double_t deResY)
-{
-
-  /// Set alignment resolution to misalign objects to be stored in CDB
-  /// if rChId is > 0 set parameters for this chamber only, counting from 1
-  TMatrixDSym mChCorrMatrix(6);
-  mChCorrMatrix[0][0] = chResX * chResX;
-  mChCorrMatrix[1][1] = chResY * chResY;
-
-  TMatrixDSym mDECorrMatrix(6);
-  mDECorrMatrix[0][0] = deResX * deResX;
-  mDECorrMatrix[1][1] = deResY * deResY;
-
-  o2::detectors::AlignParam* alignMat = 0x0;
-
-  for (Int_t chId = 0; chId <= 9; ++chId) {
-
-    // skip chamber if selection is valid, and does not match
-    if (rChId > 0 && chId + 1 != rChId)
-      continue;
-
-    TString chName1;
-    TString chName2;
-    if (chId < 4) {
-
-      chName1 = Form("GM%d", chId);
-      chName2 = Form("GM%d", chId);
-
-    } else {
-
-      chName1 = Form("GM%d", 4 + (chId - 4) * 2);
-      chName2 = Form("GM%d", 4 + (chId - 4) * 2 + 1);
-    }
-
-    for (int i = 0; i < misAlignArray->GetEntries(); ++i) {
-
-      alignMat = (o2::detectors::AlignParam*)misAlignArray->At(i);
-      TString volName(alignMat->getSymName());
-      if ((volName.Contains(chName1) &&
-           ((volName.Last('/') == volName.Index(chName1) + chName1.Length()) ||
-            (volName.Length() == volName.Index(chName1) + chName1.Length()))) ||
-          (volName.Contains(chName2) &&
-           ((volName.Last('/') == volName.Index(chName2) + chName2.Length()) ||
-            (volName.Length() == volName.Index(chName2) + chName2.Length())))) {
-
-        volName.Remove(0, volName.Last('/') + 1);
-        // if (volName.Contains("GM")){
-        //   alignMat->SetCorrMatrix(mChCorrMatrix);
-        // }else if (volName.Contains("DE")){
-        //   alignMat->SetCorrMatrix(mDECorrMatrix);
-        // }
-      }
-    }
-  }
-}
-
-//_____________________________________________________
-LocalTrackParam Alignment::RefitStraightTrack(Track& track, Double_t z0) const
-{
-
-  // initialize matrices
-  TMatrixD AtGASum(4, 4);
-  AtGASum.Zero();
-
-  TMatrixD AtGMSum(4, 1);
-  AtGMSum.Zero();
-
-  // loop over clusters
-  for (auto itTrackParam(track.begin()); itTrackParam != track.end(); ++itTrackParam) {
-
-    // get track parameters
-    if (!&*itTrackParam)
-      continue;
-
-    // get cluster
-    const Cluster* cluster = itTrackParam->getClusterPtr();
-    if (!cluster)
-      continue;
-
-    // projection matrix
-    TMatrixD A(2, 4);
-    A.Zero();
-    A(0, 0) = 1;
-    A(0, 2) = (cluster->getZ() - z0);
-    A(1, 1) = 1;
-    A(1, 3) = (cluster->getZ() - z0);
-
-    TMatrixD At(TMatrixD::kTransposed, A);
-
-    // gain matrix
-    TMatrixD G(2, 2);
-    G.Zero();
-    G(0, 0) = 1.0 / Square(cluster->getEx());
-    G(1, 1) = 1.0 / Square(cluster->getEy());
-
-    const TMatrixD AtG(At, TMatrixD::kMult, G);
-    const TMatrixD AtGA(AtG, TMatrixD::kMult, A);
-    AtGASum += AtGA;
-
-    // measurement
-    TMatrixD M(2, 1);
-    M(0, 0) = cluster->getX();
-    M(1, 0) = cluster->getY();
-    const TMatrixD AtGM(AtG, TMatrixD::kMult, M);
-    AtGMSum += AtGM;
-  }
-
-  // perform inversion
-  TMatrixD AtGASumInv(TMatrixD::kInverted, AtGASum);
-  TMatrixD X(AtGASumInv, TMatrixD::kMult, AtGMSum);
-
-  //   // TODO: compare with initial track parameters
-  //   Aliinfo( Form( "x: %.3f vs %.3f", fTrackPos0[0], X(0,0) ) );
-  //   Aliinfo( Form( "y: %.3f vs %.3f", fTrackPos0[1], X(1,0) ) );
-  //   Aliinfo( Form( "dxdz: %.6g vs %.6g", fTrackSlope0[0], X(2,0) ) );
-  //   Aliinfo( Form( "dydz: %.6g vs %.6g\n", fTrackSlope0[1], X(3,0) ) );
-
-  // fill output parameters
-  LocalTrackParam out;
-  out.fTrackX = X(0, 0);
-  out.fTrackY = X(1, 0);
-  out.fTrackZ = z0;
-  out.fTrackSlopeX = X(2, 0);
-  out.fTrackSlopeY = X(3, 0);
-
-  return out;
-}
-
-//_____________________________________________________
-void Alignment::FillDetElemData(const Cluster* cluster)
-{
-  // LOG(fatal) << __PRETTY_FUNCTION__ << " is disabled";
-  LOG(info) << __PRETTY_FUNCTION__ << " is enabled";
-
-  /// Get information of current detection element
-  // get detector element number from Alice ID
-  const Int_t detElemId = cluster->getDEId();
-  fDetElemNumber = GetDetElemNumber(detElemId);
-
-  // get detector element
-  // const AliMUONGeometryDetElement detElement(detElemId);
-  auto fTransform = fTransformCreator(detElemId);
-  /*
-  get the global transformation matrix and store its inverse, in order to manually perform
-  the global to Local transformations needed to calculate the derivatives
-  */
-  // fTransform = fTransform.Inverse();
-  // fTransform.GetTransformMatrix(fGeoCombiTransInverse);
-}
-
-//______________________________________________________________________
-void Alignment::FillRecPointData(const Cluster* cluster)
-{
-
-  /// Get information of current cluster
-  fClustPos[0] = cluster->getX();
-  fClustPos[1] = cluster->getY();
-  fClustPos[2] = cluster->getZ();
-}
-
-//______________________________________________________________________
-void Alignment::FillTrackParamData(const TrackParam* trackParam)
-{
-
-  /// Get information of current track at current cluster
-  fTrackPos[0] = trackParam->getNonBendingCoor();
-  fTrackPos[1] = trackParam->getBendingCoor();
-  fTrackPos[2] = trackParam->getZ();
-  fTrackSlope[0] = trackParam->getNonBendingSlope();
-  fTrackSlope[1] = trackParam->getBendingSlope();
-}
-
-//______________________________________________________________________
-void Alignment::LocalEquationX(void)
-{
-  /// local equation along X
-
-  // 'inverse' (GlobalToLocal) rotation matrix
-  const Double_t* r(fGeoCombiTransInverse.GetRotationMatrix());
-
-  // local derivatives
-  SetLocalDerivative(0, r[0]);
-  SetLocalDerivative(1, r[0] * (fTrackPos[2] - fTrackPos0[2]));
-  SetLocalDerivative(2, r[1]);
-  SetLocalDerivative(3, r[1] * (fTrackPos[2] - fTrackPos0[2]));
-
-  // global derivatives
-  /*
-  alignment parameters are
-  0: delta_x
-  1: delta_y
-  2: delta_phiz
-  3: delta_z
-  */
-
-  SetGlobalDerivative(fDetElemNumber * fgNParCh + 0, -r[0]);
-  SetGlobalDerivative(fDetElemNumber * fgNParCh + 1, -r[1]);
-
-  if (fBFieldOn) {
-
-    // use local position for derivatives vs 'delta_phi_z'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 2, -r[1] * fTrackPos[0] + r[0] * fTrackPos[1]);
-
-    // use local slopes for derivatives vs 'delta_z'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 3, r[0] * fTrackSlope[0] + r[1] * fTrackSlope[1]);
-
-  } else {
-
-    // local copy of extrapolated track positions
-    const Double_t trackPosX = fTrackPos0[0] + fTrackSlope0[0] * (fTrackPos[2] - fTrackPos0[2]);
-    const Double_t trackPosY = fTrackPos0[1] + fTrackSlope0[1] * (fTrackPos[2] - fTrackPos0[2]);
-
-    // use properly extrapolated position for derivatives vs 'delta_phi_z'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 2, -r[1] * trackPosX + r[0] * trackPosY);
-
-    // use slopes at origin for derivatives vs 'delta_z'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 3, r[0] * fTrackSlope0[0] + r[1] * fTrackSlope0[1]);
-  }
-
-  // store local equation
-  fMillepede->SetLocalEquation(fGlobalDerivatives, fLocalDerivatives, fMeas[0], fSigma[0]);
-}
-
-//______________________________________________________________________
-void Alignment::LocalEquationY(void)
-{
-  /// local equation along Y
-
-  // 'inverse' (GlobalToLocal) rotation matrix
-  const Double_t* r(fGeoCombiTransInverse.GetRotationMatrix());
-
-  // store local derivatives
-  SetLocalDerivative(0, r[3]);
-  SetLocalDerivative(1, r[3] * (fTrackPos[2] - fTrackPos0[2]));
-  SetLocalDerivative(2, r[4]);
-  SetLocalDerivative(3, r[4] * (fTrackPos[2] - fTrackPos0[2]));
-
-  // set global derivatives
-  SetGlobalDerivative(fDetElemNumber * fgNParCh + 0, -r[3]);
-  SetGlobalDerivative(fDetElemNumber * fgNParCh + 1, -r[4]);
-
-  if (fBFieldOn) {
-
-    // use local position for derivatives vs 'delta_phi'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 2, -r[4] * fTrackPos[0] + r[3] * fTrackPos[1]);
-
-    // use local slopes for derivatives vs 'delta_z'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 3, r[3] * fTrackSlope[0] + r[4] * fTrackSlope[1]);
-
-  } else {
-
-    // local copy of extrapolated track positions
-    const Double_t trackPosX = fTrackPos0[0] + fTrackSlope0[0] * (fTrackPos[2] - fTrackPos0[2]);
-    const Double_t trackPosY = fTrackPos0[1] + fTrackSlope0[1] * (fTrackPos[2] - fTrackPos0[2]);
-
-    // use properly extrapolated position for derivatives vs 'delta_phi'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 2, -r[4] * trackPosX + r[3] * trackPosY);
-
-    // use slopes at origin for derivatives vs 'delta_z'
-    SetGlobalDerivative(fDetElemNumber * fgNParCh + 3, r[3] * fTrackSlope0[0] + r[4] * fTrackSlope0[1]);
-  }
-
-  // store local equation
-  fMillepede->SetLocalEquation(fGlobalDerivatives, fLocalDerivatives, fMeas[1], fSigma[1]);
-}
-
-//_________________________________________________________________________
-TGeoCombiTrans Alignment::DeltaTransform(const double* lMisAlignment) const
-{
-  /// Get Delta Transformation, based on alignment parameters
-
-  // translation
-  const TGeoTranslation deltaTrans(lMisAlignment[0], lMisAlignment[1], lMisAlignment[3]);
-
-  // rotation
-  TGeoRotation deltaRot;
-  deltaRot.RotateZ(lMisAlignment[2] * 180. / TMath::Pi());
-
-  // combined rotation and translation.
-  return TGeoCombiTrans(deltaTrans, deltaRot);
-}
-
-//______________________________________________________________________
-void Alignment::AddConstraint(Double_t* par, Double_t value)
-{
-  /// Constrain equation defined by par to value
-  if (!fInitialized) {
-    LOG(fatal) << "Millepede is not initialized";
-  }
-
-  fMillepede->SetGlobalConstraint(par, value);
-}
-
-//______________________________________________________________________
-Bool_t Alignment::DetElemIsValid(Int_t iDetElemId) const
-{
-  /// return true if given detector element is valid (and belongs to muon tracker)
-  const Int_t iCh = iDetElemId / 100;
-  const Int_t iDet = iDetElemId % 100;
-  return (iCh > 0 && iCh <= fgNCh && iDet < fgNDetElemCh[iCh - 1]);
-}
-
-//______________________________________________________________________
-Int_t Alignment::GetDetElemNumber(Int_t iDetElemId) const
-{
-  /// get det element number from ID
-  // get chamber and element number in chamber
-  const Int_t iCh = iDetElemId / 100;
-  const Int_t iDet = iDetElemId % 100;
-
-  // make sure detector index is valid
-  if (!(iCh > 0 && iCh <= fgNCh && iDet < fgNDetElemCh[iCh - 1])) {
-    LOG(fatal) << "Invalid detector element id: " << iDetElemId;
-  }
-
-  // add number of detectors up to this chamber
-  return iDet + fgSNDetElemCh[iCh - 1];
-}
-
-//______________________________________________________________________
-Int_t Alignment::GetChamberId(Int_t iDetElemNumber) const
-{
-  /// get chamber (counting from 1) matching a given detector element id
-  Int_t iCh(0);
-  for (iCh = 0; iCh < fgNCh; iCh++) {
-    if (iDetElemNumber < fgSNDetElemCh[iCh])
-      break;
-  }
-
-  return iCh;
-}
-
-//______________________________________________________________________
-TString Alignment::GetParameterMaskString(UInt_t mask) const
-{
-  TString out;
-  if (mask & ParX)
-    out += "X";
-  if (mask & ParY)
-    out += "Y";
-  if (mask & ParZ)
-    out += "Z";
-  if (mask & ParTZ)
-    out += "T";
-  return out;
-}
-
-//______________________________________________________________________
-TString Alignment::GetSidesMaskString(UInt_t mask) const
-{
-  TString out;
-  if (mask & SideTop)
-    out += "T";
-  if (mask & SideLeft)
-    out += "L";
-  if (mask & SideBottom)
-    out += "B";
-  if (mask & SideRight)
-    out += "R";
-  return out;
-}
-
-} // namespace mch
-} // namespace o2
\ No newline at end of file
diff --git a/Detectors/ITSMFT/MFT/calibration/src/NoiseSlotCalibrator.cxx b/Detectors/ITSMFT/MFT/calibration/src/NoiseSlotCalibrator.cxx
deleted file mode 100644
index 13d6f3b3f567b..0000000000000
--- a/Detectors/ITSMFT/MFT/calibration/src/NoiseSlotCalibrator.cxx
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   NoiseSlotCalibrator.cxx
-
-#include "MFTCalibration/NoiseSlotCalibrator.h"
-
-#include <fairlogger/Logger.h>
-#include "TFile.h"
-#include "DataFormatsITSMFT/Digit.h"
-#include "DataFormatsITSMFT/ClusterPattern.h"
-#include "DataFormatsITSMFT/ROFRecord.h"
-
-namespace o2
-{
-using Slot = calibration::TimeSlot<o2::itsmft::NoiseMap>;
-
-namespace mft
-{
-bool NoiseSlotCalibrator::processTimeFrame(calibration::TFType nTF,
-                                           gsl::span<const o2::itsmft::Digit> const& digits,
-                                           gsl::span<const o2::itsmft::ROFRecord> const& rofs)
-{
-  LOG(detail) << "Processing TF# " << nTF;
-
-  auto& slotTF = getSlotForTF(nTF);
-  auto& noiseMap = *(slotTF.getContainer());
-
-  for (const auto& rof : rofs) {
-    auto digitsInFrame = rof.getROFData(digits);
-    for (const auto& d : digitsInFrame) {
-      auto id = d.getChipIndex();
-      auto row = d.getRow();
-      auto col = d.getColumn();
-
-      noiseMap.increaseNoiseCount(id, row, col);
-    }
-  }
-  noiseMap.addStrobes(rofs.size());
-  mNumberOfStrobes += rofs.size();
-  return hasEnoughData(slotTF);
-}
-
-bool NoiseSlotCalibrator::processTimeFrame(calibration::TFType nTF,
-                                           gsl::span<const o2::itsmft::CompClusterExt> const& clusters,
-                                           gsl::span<const unsigned char> const& patterns,
-                                           gsl::span<const o2::itsmft::ROFRecord> const& rofs)
-{
-  LOG(detail) << "Processing TF# " << nTF;
-
-  auto& slotTF = getSlotForTF(nTF);
-  auto& noiseMap = *(slotTF.getContainer());
-
-  auto pattIt = patterns.begin();
-  for (const auto& rof : rofs) {
-    auto clustersInFrame = rof.getROFData(clusters);
-    for (const auto& c : clustersInFrame) {
-      if (c.getPatternID() != o2::itsmft::CompCluster::InvalidPatternID) {
-        // For the noise calibration, we use "pass1" clusters...
-        continue;
-      }
-      o2::itsmft::ClusterPattern patt(pattIt);
-
-      auto id = c.getSensorID();
-      auto row = c.getRow();
-      auto col = c.getCol();
-      auto colSpan = patt.getColumnSpan();
-      auto rowSpan = patt.getRowSpan();
-
-      // Fast 1-pixel calibration
-      if ((rowSpan == 1) && (colSpan == 1)) {
-        noiseMap.increaseNoiseCount(id, row, col);
-        continue;
-      }
-
-      // All-pixel calibration
-      auto nBits = rowSpan * colSpan;
-      int ic = 0, ir = 0;
-      for (unsigned int i = 2; i < patt.getUsedBytes() + 2; i++) {
-        unsigned char tempChar = patt.getByte(i);
-        int s = 128; // 0b10000000
-        while (s > 0) {
-          if ((tempChar & s) != 0) {
-            noiseMap.increaseNoiseCount(id, row + ir, col + ic);
-          }
-          ic++;
-          s >>= 1;
-          if ((ir + 1) * ic == nBits) {
-            break;
-          }
-          if (ic == colSpan) {
-            ic = 0;
-            ir++;
-          }
-        }
-        if ((ir + 1) * ic == nBits) {
-          break;
-        }
-      }
-    }
-  }
-  noiseMap.addStrobes(rofs.size());
-  mNumberOfStrobes += rofs.size();
-  return hasEnoughData(slotTF);
-}
-
-// Functions overloaded from the calibration framework
-bool NoiseSlotCalibrator::process(calibration::TFType tf, const gsl::span<const o2::itsmft::CompClusterExt> data)
-{
-  LOG(warning) << "Only 1-pix noise calibraton is possible !";
-  return calibration::TimeSlotCalibration<o2::itsmft::CompClusterExt, o2::itsmft::NoiseMap>::process(tf, data);
-}
-
-// Functions required by the calibration framework
-
-Slot& NoiseSlotCalibrator::emplaceNewSlot(bool front, calibration::TFType tstart, calibration::TFType tend)
-{
-  auto& cont = getSlots();
-  auto& slot = front ? cont.emplace_front(tstart, tend) : cont.emplace_back(tstart, tend);
-  slot.setContainer(std::make_unique<o2::itsmft::NoiseMap>(936));
-  return slot;
-}
-
-bool NoiseSlotCalibrator::hasEnoughData(const Slot& slot) const
-{
-  return slot.getContainer()->getNumberOfStrobes() > mMinROFs ? true : false;
-}
-
-void NoiseSlotCalibrator::finalizeSlot(Slot& slot)
-{
-  o2::itsmft::NoiseMap* map = slot.getContainer();
-  LOG(info) << "Number of processed strobes is " << map->getNumberOfStrobes();
-  map->applyProbThreshold(mProbabilityThreshold, map->getNumberOfStrobes(), mProbRelErr);
-}
-
-} // namespace mft
-} // namespace o2
diff --git a/Detectors/MUON/MCH/Mapping/SegContour/src/SegmentationSVGWriter.cxx b/Detectors/MUON/MCH/Mapping/SegContour/src/SegmentationSVGWriter.cxx
deleted file mode 100644
index b614346f1a42a..0000000000000
--- a/Detectors/MUON/MCH/Mapping/SegContour/src/SegmentationSVGWriter.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// @author  Laurent Aphecetche
-
-#include "MCHMappingSegContour/CathodeSegmentationSVGWriter.h"
-#include "MCHMappingInterface/CathodeSegmentation.h"
-#include "MCHMappingSegContour/CathodeSegmentationContours.h"
-#include "MCHContour/SVGWriter.h"
-#include <ostream>
-
-using namespace o2::mch::contour;
-
-namespace o2
-{
-namespace mch
-{
-namespace mapping
-{
-
-std::string svgCathodeSegmentationDefaultStyle()
-{
-  return R"(
-.pads {
-  fill: #EEEEEE;
-  stroke-width: 0.025px;
-  stroke: #AAAAAA;
-}
-.padchannels {
-  font-size: 0.4px;
-  font-family: arial;
-  fill: blue;
-  text-anchor: middle;
-}
-.dualsampas {
-  fill:none;
-  stroke-width: 0.025px;
-  stroke: #333333;
-}
-.detectionelements {
-  fill:none;
-  stroke-width:0.025px;
-  stroke: #000000;
-}
-.testpoints {
-  fill:red;
-  stroke-width:0.025px;
-  stroke: black;
-  opacity: 0.5;
-}
-)";
-}
-
-void svgCathodeSegmentation(const CathodeSegmentation& seg, SVGWriter& w, bool showdes, bool showdualsampas, bool showpads,
-                            bool showpadchannels)
-{
-  std::vector<Contour<double>> dualSampaContours = getDualSampaContours(seg);
-  std::vector<std::vector<Polygon<double>>> dualSampaPads = getPadPolygons(seg);
-  std::vector<std::vector<int>> dualSampaPadChannels = getPadChannels(seg);
-
-  if (dualSampaPadChannels.size() != dualSampaPads.size()) {
-    throw std::runtime_error("gouze");
-  }
-
-  auto deContour = getEnvelop(seg);
-  auto box = getBBox(seg);
-
-  if (showpads) {
-    w.svgGroupStart("pads");
-    for (auto& dsp : dualSampaPads) {
-      for (auto& p : dsp) {
-        w.polygon(p);
-      }
-    }
-    w.svgGroupEnd();
-  }
-
-  if (showpadchannels) {
-    w.svgGroupStart("padchannels");
-    for (auto i = 0; i < dualSampaPads.size(); ++i) {
-      auto& dsp = dualSampaPads[i];
-      auto& dspch = dualSampaPadChannels[i];
-      for (auto j = 0; j < dsp.size(); j++) {
-        auto bbox = getBBox(dsp[j]);
-        w.text(std::to_string(dspch[j]), bbox.xcenter(),
-               bbox.ymax() - 0.05 * bbox.height()); // SVG text y position is the bottom of the text
-      }
-    }
-    w.svgGroupEnd();
-  }
-
-  if (showdualsampas) {
-    w.svgGroupStart("dualsampas");
-    for (auto& dsp : dualSampaContours) {
-      w.contour(dsp);
-    }
-    w.svgGroupEnd();
-  }
-
-  if (showdes) {
-    w.svgGroupStart("detectionelements");
-    w.contour(deContour);
-  }
-}
-
-} // namespace mapping
-} // namespace mch
-} // namespace o2
diff --git a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferCRUBare.cxx b/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferCRUBare.cxx
deleted file mode 100644
index 52e4581da1a71..0000000000000
--- a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferCRUBare.cxx
+++ /dev/null
@@ -1,938 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "RefBuffers.h"
-#include <array>
-#include "MCHRawCommon/DataFormats.h"
-
-extern std::array<const uint8_t, 10944> REF_BUFFER_CRU_BARE_CHARGESUM;
-template <>
-gsl::span<const std::byte> REF_BUFFER_CRU<o2::mch::raw::BareFormat, o2::mch::raw::ChargeSumMode>()
-{
-  return gsl::span<const std::byte>(reinterpret_cast<const std::byte*>(&REF_BUFFER_CRU_BARE_CHARGESUM[0]), REF_BUFFER_CRU_BARE_CHARGESUM.size());
-}
-std::array<const uint8_t, 10944> REF_BUFFER_CRU_BARE_CHARGESUM = {
-  // clang-format off
-0x04, 0x40, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0xB0, 0x12, 0xB0, 0x12, 
-0x00, 0x00, 0x0D, 0x10, 0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 
-0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAB, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA9, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAB, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA8, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xA8, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 
-0x1B, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x01, 0x0D, 0x10, 
-0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 0x03, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x04, 0x40, 0x00, 0x00, 0x1E, 0x01, 0x00, 0x00, 0x40, 0x0A, 0x40, 0x0A, 
-0x00, 0x00, 0x0F, 0x00, 0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 
-0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAE, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF3, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAE, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAE, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF3, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA2, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA2, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 
-0x1E, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x01, 0x0F, 0x00, 
-0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 0x03, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x04, 0x40, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0x10, 0x0D, 0x10, 0x0D, 
-0x07, 0x00, 0x0D, 0x10, 0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 
-0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFD, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAB, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFD, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA9, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA9, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAB, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA9, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xA9, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 
-0x1B, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x07, 0x01, 0x0D, 0x10, 
-0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 0x03, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-  // clang-format on
-};
diff --git a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferCRUUserLogic.cxx b/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferCRUUserLogic.cxx
deleted file mode 100644
index 3c3781460f4d1..0000000000000
--- a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferCRUUserLogic.cxx
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "RefBuffers.h"
-#include <array>
-#include "MCHRawCommon/DataFormats.h"
-
-extern std::array<const uint8_t, 496> REF_BUFFER_CRU_USERLOGIC_CHARGESUM;
-template <>
-gsl::span<const std::byte> REF_BUFFER_CRU<o2::mch::raw::UserLogicFormat, o2::mch::raw::ChargeSumMode>()
-{
-  return gsl::span<const std::byte>(reinterpret_cast<const std::byte*>(&REF_BUFFER_CRU_USERLOGIC_CHARGESUM[0]), REF_BUFFER_CRU_USERLOGIC_CHARGESUM.size());
-}
-std::array<const uint8_t, 496> REF_BUFFER_CRU_USERLOGIC_CHARGESUM = {
-  // clang-format off
-0x04, 0x40, 0x00, 0x00, 0x1E, 0x01, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 
-0x0F, 0x00, 0x0F, 0x00, 0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 
-0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x13, 0x01, 0xF0, 0x40, 0x55, 0x55, 0xA1, 0x00, 
-0x03, 0x12, 0x00, 0xE3, 0x46, 0x00, 0xA0, 0x00, 0x01, 0x60, 0xD0, 0x00, 
-0x00, 0x58, 0xA2, 0x00, 0x04, 0x40, 0xBB, 0x11, 0x00, 0x01, 0xA0, 0x00, 
-0x18, 0x14, 0x02, 0x40, 0x90, 0x04, 0xA0, 0x00, 0x70, 0x6F, 0x04, 0x40, 
-0x00, 0x18, 0xA0, 0x00, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 
-0xED, 0xDE, 0xED, 0xFE, 0xED, 0xDE, 0xED, 0xFE, 0x04, 0x40, 0x00, 0x00, 
-0x1E, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 0x0F, 0x01, 0x0F, 0x00, 
-0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 0x03, 0x08, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x04, 0x40, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0xF0, 0x00, 0xF0, 0x00, 
-0x0F, 0x00, 0x0D, 0x10, 0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 
-0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x13, 0x01, 0xF0, 0x40, 0x55, 0x55, 0x81, 0x38, 
-0x1A, 0x12, 0x80, 0xE0, 0x46, 0x00, 0x80, 0x38, 0x01, 0x60, 0xA0, 0x00, 
-0x00, 0x4D, 0x82, 0x38, 0x04, 0x60, 0xB8, 0x11, 0x00, 0x01, 0x80, 0x38, 
-0x18, 0x50, 0x00, 0x80, 0x90, 0x04, 0x80, 0x38, 0x28, 0x6E, 0x04, 0x40, 
-0x00, 0x18, 0x80, 0x38, 0x1E, 0x00, 0x50, 0x21, 0x01, 0x38, 0x82, 0x38, 
-0x1B, 0x01, 0x10, 0x00, 0x06, 0x28, 0x80, 0x38, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x80, 0x38, 0xED, 0xDE, 0xED, 0xFE, 0xED, 0xDE, 0xED, 0xFE, 
-0x13, 0x01, 0xF0, 0x40, 0x55, 0x55, 0x01, 0x04, 0x03, 0x12, 0x40, 0xF6, 
-0x46, 0x00, 0x00, 0x04, 0x01, 0x60, 0x40, 0x1A, 0x00, 0x54, 0x02, 0x04, 
-0x04, 0xD0, 0xBD, 0x11, 0x00, 0x01, 0x00, 0x04, 0x18, 0xB8, 0x06, 0x00, 
-0x96, 0x04, 0x00, 0x04, 0x84, 0x6F, 0x04, 0x40, 0x00, 0x18, 0x00, 0x04, 
-0xB8, 0x01, 0xF0, 0x20, 0x01, 0x94, 0x03, 0x04, 0x1B, 0x01, 0x10, 0x00, 
-0x06, 0xC2, 0x01, 0x04, 0x00, 0x00, 0x48, 0x00, 0xE9, 0x1B, 0x01, 0x04, 
-0x00, 0x04, 0x80, 0x01, 0x73, 0x00, 0x00, 0x04, 0x48, 0x12, 0x50, 0xEA, 
-0x46, 0x00, 0x00, 0x04, 0x01, 0x60, 0x40, 0x1A, 0x00, 0x00, 0x00, 0x04, 
-0x04, 0x40, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, 
-0x0F, 0x01, 0x0D, 0x10, 0x39, 0x30, 0x00, 0x00, 0x39, 0x30, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0x02, 0xA6, 0x02, 
-0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00
-  // clang-format on
-};
diff --git a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferGBTBare.cxx b/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferGBTBare.cxx
deleted file mode 100644
index 89b1602cb0489..0000000000000
--- a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferGBTBare.cxx
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "RefBuffers.h"
-#include <array>
-#include "MCHRawCommon/DataFormats.h"
-
-extern std::array<const uint8_t, 2560> REF_BUFFER_GBT_BARE_CHARGESUM;
-template <>
-gsl::span<const std::byte> REF_BUFFER_GBT<o2::mch::raw::BareFormat, o2::mch::raw::ChargeSumMode>()
-{
-  return gsl::span<const std::byte>(reinterpret_cast<const std::byte*>(&REF_BUFFER_GBT_BARE_CHARGESUM[0]), REF_BUFFER_GBT_BARE_CHARGESUM.size());
-}
-std::array<const uint8_t, 2560> REF_BUFFER_GBT_BARE_CHARGESUM = {
-  // clang-format off
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xBC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xBC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x69, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xEB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xBD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x2A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x2A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x7D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xEB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x3C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x2A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xA8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xE8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xE8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x3E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
-0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x2A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x2A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE8, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-0xAA, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00
-  // clang-format on
-};
diff --git a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferGBTUserLogic.cxx b/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferGBTUserLogic.cxx
deleted file mode 100644
index 9487037328ad2..0000000000000
--- a/Detectors/MUON/MCH/Raw/Encoder/Payload/RefBufferGBTUserLogic.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "RefBuffers.h"
-#include <array>
-#include "MCHRawCommon/DataFormats.h"
-
-extern std::array<const uint8_t, 96> REF_BUFFER_GBT_USERLOGIC_CHARGESUM;
-template <>
-gsl::span<const std::byte> REF_BUFFER_GBT<o2::mch::raw::UserLogicFormat, o2::mch::raw::ChargeSumMode>()
-{
-  return gsl::span<const std::byte>(reinterpret_cast<const std::byte*>(&REF_BUFFER_GBT_USERLOGIC_CHARGESUM[0]), REF_BUFFER_GBT_USERLOGIC_CHARGESUM.size());
-}
-std::array<const uint8_t, 96> REF_BUFFER_GBT_USERLOGIC_CHARGESUM = {
-  // clang-format off
-0x13, 0x01, 0xF0, 0x40, 0x55, 0x55, 0x01, 0x58, 0x0C, 0x12, 0x00, 0xA0, 
-0x50, 0x03, 0x00, 0x58, 0x01, 0x30, 0xA0, 0x00, 0x00, 0x5B, 0x02, 0x58, 
-0x04, 0xC0, 0x2F, 0xD4, 0x00, 0x01, 0x00, 0x58, 0x0C, 0x80, 0x02, 0x00, 
-0x00, 0x00, 0x00, 0x58, 0x13, 0x01, 0xF0, 0x40, 0x55, 0x55, 0x61, 0x58, 
-0x19, 0x12, 0x60, 0xAD, 0x50, 0x03, 0x60, 0x58, 0x01, 0x30, 0xD0, 0x00, 
-0x00, 0x09, 0x62, 0x58, 0x04, 0x5C, 0x28, 0xD4, 0x00, 0x01, 0x60, 0x58, 
-0x0C, 0x14, 0x02, 0x40, 0x82, 0x04, 0x60, 0x58, 0xF7, 0x0B, 0x35, 0x40, 
-0x00, 0x0C, 0x60, 0x58, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x58
-
-  // clang-format on
-};
diff --git a/Detectors/MUON/MID/Filtering/test/bench_Filter.cxx b/Detectors/MUON/MID/Filtering/test/bench_Filter.cxx
deleted file mode 100644
index a54ea9c1733a8..0000000000000
--- a/Detectors/MUON/MID/Filtering/test/bench_Filter.cxx
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file   MID/Tracking/test/bench_Tracker.cxx
-/// \brief  Benchmark tracker device for MID
-/// \author Diego Stocco <Diego.Stocco at cern.ch>
-/// \date   17 March 2018
-
-#include "benchmark/benchmark.h"
-#include <random>
-#include "DataFormatsMID/Cluster.h"
-#include "DataFormatsMID/Track.h"
-#include "MIDBase/HitFinder.h"
-#include "MIDBase/Mapping.h"
-#include "MIDBase/MpArea.h"
-#include "MIDTestingSimTools/TrackGenerator.h"
-#include "MIDTracking/Tracker.h"
-
-std::vector<o2::mid::Cluster> generateTestData(int nTracks, o2::mid::TrackGenerator& trackGen,
-                                               const o2::mid::HitFinder& hitFinder, const o2::mid::Mapping& mapping)
-{
-  o2::mid::Mapping::MpStripIndex stripIndex;
-  o2::mid::MpArea area;
-  std::vector<o2::mid::Cluster> clusters;
-  o2::mid::Cluster cl;
-  std::vector<o2::mid::Track> tracks = trackGen.generate(nTracks);
-  for (auto& track : tracks) {
-    for (int ich = 0; ich < 4; ++ich) {
-      auto hits = hitFinder.getLocalPositions(track, ich);
-      bool isFired = false;
-      for (auto& hit : hits) {
-        int deId = hit.deId;
-        float xPos = hit.xCoor;
-        float yPos = hit.yCoor;
-        stripIndex = mapping.stripByPosition(xPos, yPos, 0, deId, false);
-        if (!stripIndex.isValid()) {
-          continue;
-        }
-        cl.deId = deId;
-        area = mapping.stripByLocation(stripIndex.strip, 0, stripIndex.line, stripIndex.column, deId);
-        cl.yCoor = area.getCenterY();
-        cl.yErr = area.getHalfSizeY() / std::sqrt(3.);
-        stripIndex = mapping.stripByPosition(xPos, yPos, 1, deId, false);
-        area = mapping.stripByLocation(stripIndex.strip, 1, stripIndex.line, stripIndex.column, deId);
-        cl.xCoor = area.getCenterX();
-        cl.xErr = area.getHalfSizeX() / std::sqrt(3.);
-        clusters.push_back(cl);
-      } // loop on fired pos
-    }   // loop on chambers
-  }     // loop on tracks
-  return clusters;
-}
-
-static void BM_TRACKER(benchmark::State& state)
-{
-  o2::mid::GeometryTransformer geoTrans = o2::mid::createDefaultTransformer();
-  o2::mid::TrackGenerator trackGen;
-  o2::mid::HitFinder hitFinder(geoTrans);
-  o2::mid::Mapping mapping;
-  o2::mid::Tracker tracker(geoTrans);
-
-  int nTracksPerEvent = state.range(0);
-  tracker.init((state.range(1) == 1));
-  double num{0};
-
-  std::vector<o2::mid::Cluster> inputData;
-
-  for (auto _ : state) {
-    state.PauseTiming();
-    inputData = generateTestData(nTracksPerEvent, trackGen, hitFinder, mapping);
-    state.ResumeTiming();
-    tracker.process(inputData);
-    ++num;
-  }
-
-  state.counters["num"] = benchmark::Counter(num, benchmark::Counter::kIsRate);
-}
-
-static void CustomArguments(benchmark::internal::Benchmark* bench)
-{
-  for (int itrack = 1; itrack <= 8; ++itrack) {
-    for (int imethod = 0; imethod < 2; ++imethod) {
-      bench->Args({itrack, imethod});
-    }
-  }
-}
-
-BENCHMARK(BM_TRACKER)->Apply(CustomArguments)->Unit(benchmark::kNanosecond);
-
-BENCHMARK_MAIN();
diff --git a/Detectors/MUON/MID/Workflow/include/MIDWorkflow/DecodedDataDumpSpec.h b/Detectors/MUON/MID/Workflow/include/MIDWorkflow/DecodedDataDumpSpec.h
deleted file mode 100644
index 4d104aacac15c..0000000000000
--- a/Detectors/MUON/MID/Workflow/include/MIDWorkflow/DecodedDataDumpSpec.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file   MIDWorkflow/RawDumpSpec.h
-/// \brief  Device to dump decoded raw data
-/// \author Diego Stocco <Diego.Stocco at cern.ch>
-/// \date   17 February 2022
-
-#ifndef O2_MID_RAWDUMPSPEC_H
-#define O2_MID_RAWDUMPSPEC_H
-
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace mid
-{
-framework::DataProcessorSpec getRawDumpSpec();
-} // namespace mid
-} // namespace o2
-
-#endif // O2_MID_RAWDUMPSPEC_H
diff --git a/Detectors/MUON/MID/Workflow/include/MIDWorkflow/RawAggregatorSpec.h b/Detectors/MUON/MID/Workflow/include/MIDWorkflow/RawAggregatorSpec.h
deleted file mode 100644
index b5a6b33530c8f..0000000000000
--- a/Detectors/MUON/MID/Workflow/include/MIDWorkflow/RawAggregatorSpec.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file   MIDWorkflow/RawAggregatorSpec.h
-/// \brief  Data processor spec for MID raw data aggregator devices
-/// \author Diego Stocco <Diego.Stocco at cern.ch>
-/// \date   26 February 2020
-
-#ifndef O2_MID_RAWAGGREGATORSPEC_H
-#define O2_MID_RAWAGGREGATORSPEC_H
-
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace mid
-{
-framework::DataProcessorSpec getRawAggregatorSpec();
-} // namespace mid
-} // namespace o2
-
-#endif //O2_MID_RAWAGGREGATORSPEC_H
diff --git a/Detectors/MUON/MID/Workflow/src/DecodedDataDumpSpec.cxx b/Detectors/MUON/MID/Workflow/src/DecodedDataDumpSpec.cxx
deleted file mode 100644
index 77d05a8b3374f..0000000000000
--- a/Detectors/MUON/MID/Workflow/src/DecodedDataDumpSpec.cxx
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file   MID/Workflow/src/RawDumpSpec.cxx
-/// \brief  Device to dump decoded raw data
-/// \author Diego Stocco <Diego.Stocco at cern.ch>
-/// \date   17 February 2022
-
-#include "MIDWorkflow/RawDumpSpec.h"
-
-#include <fstream>
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/Logger.h"
-#include "Framework/Task.h"
-#include "fmt/format.h"
-#include "DataFormatsMID/ROBoard.h"
-#include "DataFormatsMID/ROFRecord.h"
-
-namespace o2
-{
-namespace mid
-{
-
-class RawDumpDeviceDPL
-{
- public:
-  void init(o2::framework::InitContext& ic)
-  {
-    auto outFilename = ic.options().get<std::string>("mid-dump-outfile");
-
-    if (!outFilename.empty()) {
-      mOutFile.open(outFilename.c_str());
-    }
-  }
-
-  void
-    run(o2::framework::ProcessingContext& pc)
-  {
-
-    auto data = pc.inputs().get<gsl::span<ROBoard>>("mid_decoded");
-    auto dataROFs = pc.inputs().get<gsl::span<ROFRecord>>("mid_decoded_rof");
-    std::stringstream ss;
-    for (auto& rof : dataROFs) {
-      ss << fmt::format("BCid: 0x{:x} Orbit: 0x{:x}  EvtType: {:d}", rof.interactionRecord.bc, rof.interactionRecord.orbit, static_cast<int>(rof.eventType)) << std::endl;
-      for (auto colIt = data.begin() + rof.firstEntry, end = data.begin() + rof.getEndIndex(); colIt != end; ++colIt) {
-        ss << *colIt << std::endl;
-      }
-    }
-    if (mOutFile.is_open()) {
-      mOutFile << ss.str();
-    } else {
-      LOG(info) << ss.str();
-    }
-  }
-
- private:
-  std::ofstream mOutFile; /// Output file
-};
-
-framework::DataProcessorSpec getRawDumpSpec()
-{
-  std::vector<o2::framework::InputSpec> inputSpecs{
-    o2::framework::InputSpec{"mid_decoded", header::gDataOriginMID, "DECODED", 0, o2::framework::Lifetime::Timeframe},
-    o2::framework::InputSpec{"mid_decoded_rof", header::gDataOriginMID, "DECODEDROF", 0, o2::framework::Lifetime::Timeframe}};
-
-  return o2::framework::DataProcessorSpec{
-    "MIDRawDataDumper",
-    {inputSpecs},
-    {},
-    o2::framework::AlgorithmSpec{o2::framework::adaptFromTask<RawDumpDeviceDPL>()},
-    o2::framework::Options{{"mid-dump-outfile", o2::framework::VariantType::String, "", {"Dump output to file"}}}};
-}
-
-} // namespace mid
-} // namespace o2
diff --git a/Detectors/MUON/MID/Workflow/src/decoded-data-dump-workflow.cxx b/Detectors/MUON/MID/Workflow/src/decoded-data-dump-workflow.cxx
deleted file mode 100644
index 036b63bc75338..0000000000000
--- a/Detectors/MUON/MID/Workflow/src/decoded-data-dump-workflow.cxx
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file   MID/Workflow/src/raw-dump-workflow.cxx
-/// \brief  MID raw dump workflow
-/// \author Diego Stocco <Diego.Stocco at cern.ch>
-/// \date   17 February 2022
-
-#include <string>
-#include <vector>
-#include "Framework/Variant.h"
-#include "Framework/ConfigParamSpec.h"
-#include "MIDRaw/CrateMasks.h"
-#include "MIDRaw/ElectronicsDelay.h"
-#include "MIDRaw/FEEIdConfig.h"
-#include "MIDWorkflow/RawDumpSpec.h"
-#include "MIDWorkflow/RawDecoderSpec.h"
-
-using namespace o2::framework;
-
-// add workflow options, note that customization needs to be declared before
-// including Framework/runDataProcessing
-void customize(std::vector<ConfigParamSpec>& workflowOptions)
-{
-  std::vector<ConfigParamSpec>
-    options{
-      {"feeId-config-file", VariantType::String, "", {"Filename with crate FEE ID correspondence"}},
-      {"crate-masks-file", VariantType::String, "", {"Filename with crate masks"}},
-      {"electronics-delay-file", VariantType::String, "", {"Filename with electronics delay"}}};
-  workflowOptions.insert(workflowOptions.end(), options.begin(), options.end());
-}
-
-#include "Framework/runDataProcessing.h"
-
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
-{
-  auto feeIdConfigFilename = cfgc.options().get<std::string>("feeId-config-file");
-  o2::mid::FEEIdConfig feeIdConfig;
-  if (!feeIdConfigFilename.empty()) {
-    feeIdConfig = o2::mid::FEEIdConfig(feeIdConfigFilename.c_str());
-  }
-  auto crateMasksFilename = cfgc.options().get<std::string>("crate-masks-file");
-  o2::mid::CrateMasks crateMasks;
-  if (!crateMasksFilename.empty()) {
-    crateMasks = o2::mid::CrateMasks(crateMasksFilename.c_str());
-  }
-  auto electronicsDelayFilename = cfgc.options().get<std::string>("electronics-delay-file");
-  o2::mid::ElectronicsDelay electronicsDelay;
-  if (!electronicsDelayFilename.empty()) {
-    electronicsDelay = o2::mid::readElectronicsDelay(electronicsDelayFilename.c_str());
-  }
-
-  WorkflowSpec specs;
-  specs.emplace_back(o2::mid::getRawDecoderSpec(true, feeIdConfig, crateMasks, electronicsDelay, false));
-  specs.emplace_back(o2::mid::getRawDumpSpec());
-  return specs;
-}
diff --git a/Detectors/TPC/qc/test/test_DCSPTemperature.cxx b/Detectors/TPC/qc/test/test_DCSPTemperature.cxx
deleted file mode 100644
index 6a59c3d4605db..0000000000000
--- a/Detectors/TPC/qc/test/test_DCSPTemperature.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#define BOOST_TEST_MODULE Test TPC QC
-#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include "DataFormatsTPC/Defs.h"
-#include "TPCQC/DCSPTemperature.h"
-#include <cmath>
-
-BOOST_AUTO_TEST_CASE(ReadWriteROOTFile)
-{
-  o2::tpc::qc::DCSPTemperature temp;
-}
diff --git a/Detectors/TPC/reconstruction/include/TPCReconstruction/ClusterContainer.h b/Detectors/TPC/reconstruction/include/TPCReconstruction/ClusterContainer.h
deleted file mode 100644
index d86a845b0fe4c..0000000000000
--- a/Detectors/TPC/reconstruction/include/TPCReconstruction/ClusterContainer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file ClusterContainer.h
-/// \brief Container class for TPC clusters
-#ifndef _ALICEO2_TPC_ClusterContainer_
-#define _ALICEO2_TPC_ClusterContainer_
-
-#include <vector>
-#include <cassert>
-#include <Rtypes.h> // for Float_t etc
-
-namespace o2
-{
-namespace tpc
-{
-
-/// \class ClusterContainer
-/// \brief Container class for TPC clusters
-class ClusterContainer
-{
- public:
-  // Initialize the clones array
-  // @param clusterType Possibility to store different types of clusters
-  // void InitArray(const Char_t* clusterType="o2::tpc::Cluster");
-
-  /// Add cluster to array
-  /// @param output, the vector to append to
-  /// @param cru CRU (sector)
-  /// @param row Row
-  /// @param q Total charge of cluster
-  /// @param qmax Maximum charge in a single cell (pad, time)
-  /// @param padmean Mean position of cluster in pad direction
-  /// @param padsigma Sigma of cluster in pad direction
-  /// @param timemean Mean position of cluster in time direction
-  /// @param timesigma Sigma of cluster in time direction
-  template <typename ClusterType>
-  static ClusterType* addCluster(std::vector<ClusterType>* output,
-                                 Int_t cru, Int_t row, Float_t qTot, Float_t qMax,
-                                 Float_t meanpad, Float_t meantime, Float_t sigmapad,
-                                 Float_t sigmatime)
-  {
-    assert(output);
-    output->emplace_back(); // emplace_back a defaut constructed cluster of type ClusterType
-    auto& cluster = output->back();
-    // set its concrete parameters:
-    // ATTENTION: the order of parameters in setParameters is different than in AddCluster!
-    cluster.setParameters(cru, row, qTot, qMax,
-                          meanpad, sigmapad,
-                          meantime, sigmatime);
-    return &cluster;
-  }
-};
-} // namespace tpc
-} // namespace o2
-
-#endif
diff --git a/Detectors/TPC/workflow/src/time-series-merge-integrator.cxx b/Detectors/TPC/workflow/src/time-series-merge-integrator.cxx
deleted file mode 100644
index c17b68e307328..0000000000000
--- a/Detectors/TPC/workflow/src/time-series-merge-integrator.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "TPCWorkflow/TPCMergeTimeSeriesSpec.h"
-#include "CommonUtils/ConfigurableParam.h"
-#include "Framework/ConfigParamSpec.h"
-
-using namespace o2::framework;
-
-void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
-{
-  std::vector<ConfigParamSpec> options{
-    ConfigParamSpec{"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}},
-  };
-  std::swap(workflowOptions, options);
-}
-
-#include "Framework/runDataProcessing.h"
-
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
-{
-  WorkflowSpec wf;
-  o2::conf::ConfigurableParam::updateFromString(cfgc.options().get<std::string>("configKeyValues"));
-  wf.emplace_back(o2::tpc::getTPCMergeTimeSeriesSpec());
-  return wf;
-}
diff --git a/Detectors/TPC/workflow/src/time-series-reader.cxx b/Detectors/TPC/workflow/src/time-series-reader.cxx
deleted file mode 100644
index ccedbdf4f9599..0000000000000
--- a/Detectors/TPC/workflow/src/time-series-reader.cxx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "TPCWorkflow/TPCTimeSeriesReaderSpec.h"
-#include "CommonUtils/ConfigurableParam.h"
-#include "Framework/ConfigParamSpec.h"
-
-using namespace o2::framework;
-
-#include "Framework/runDataProcessing.h"
-
-WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
-{
-  WorkflowSpec wf;
-  wf.emplace_back(o2::tpc::getTPCTimeSeriesReaderSpec());
-  return wf;
-}
diff --git a/Detectors/TRD/base/src/CalSingleChamberStatus.cxx b/Detectors/TRD/base/src/CalSingleChamberStatus.cxx
deleted file mode 100644
index f054d49766461..0000000000000
--- a/Detectors/TRD/base/src/CalSingleChamberStatus.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//  Calibration base class for a single ROC                                  //
-//  Contains one char value per pad                                          //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-#include "TRDBase/CalSingleChamberStatus.h"
-
-using namespace o2::trd;
-
-//_____________________________________________________________________________
-CalSingleChamberStatus::CalSingleChamberStatus() = default;
-
-//_____________________________________________________________________________
-CalSingleChamberStatus::CalSingleChamberStatus(Int_t p, Int_t c, Int_t cols)
-  : mPla(p), mCha(c), mNcols(cols)
-{
-  //
-  // Constructor that initializes a given pad plane type
-  //
-
-  //
-  // The pad plane parameter
-  //
-  switch (p) {
-    case 0:
-      if (c == 2) {
-        // L0C0 type
-        mNrows = 12;
-      } else {
-        // L0C1 type
-        mNrows = 16;
-      }
-      break;
-    case 1:
-      if (c == 2) {
-        // L1C0 type
-        mNrows = 12;
-      } else {
-        // L1C1 type
-        mNrows = 16;
-      }
-      break;
-    case 2:
-      if (c == 2) {
-        // L2C0 type
-        mNrows = 12;
-      } else {
-        // L2C1 type
-        mNrows = 16;
-      }
-      break;
-    case 3:
-      if (c == 2) {
-        // L3C0 type
-        mNrows = 12;
-      } else {
-        // L3C1 type
-        mNrows = 16;
-      }
-      break;
-    case 4:
-      if (c == 2) {
-        // L4C0 type
-        mNrows = 12;
-      } else {
-        // L4C1 type
-        mNrows = 16;
-      }
-      break;
-    case 5:
-      if (c == 2) {
-        // L5C0 type
-        mNrows = 12;
-      } else {
-        // L5C1 type
-        mNrows = 16;
-      }
-      break;
-  };
-
-  mNchannels = mNrows * mNcols;
-  if (mNchannels != 0) {
-    mData.resize(mNchannels);
-  }
-  memset(&mData[0], 0, sizeof(mData[0]) * mData.size());
-}
-
-//_____________________________________________________________________________
-CalSingleChamberStatus::CalSingleChamberStatus(const CalSingleChamberStatus& c)
-  : mPla(c.mPla), mCha(c.mCha), mNrows(c.mNrows), mNcols(c.mNcols), mNchannels(c.mNchannels)
-{
-  //
-  // CalSingleChamberStatus copy constructor
-  //
-
-  mData = c.mData;
-}
-
-//_____________________________________________________________________________
-CalSingleChamberStatus::~CalSingleChamberStatus() = default;
-
-//_____________________________________________________________________________
-CalSingleChamberStatus& CalSingleChamberStatus::operator=(const CalSingleChamberStatus& c)
-{
-  //
-  // Assignment operator
-  //
-
-  if (this == &c) {
-    return *this;
-  }
-
-  mPla = c.mPla;
-  mCha = c.mCha;
-  mNrows = c.mNrows;
-  mNcols = c.mNcols;
-  mNchannels = c.mNchannels;
-  mData = c.mData;
-
-  return *this;
-}
-
-//_____________________________________________________________________________
-void CalSingleChamberStatus::Copy(CalSingleChamberStatus& c) const
-{
-  //
-  // Copy function
-  //
-
-  Int_t iBin = 0;
-
-  c.mPla = mPla;
-  c.mCha = mCha;
-
-  c.mNrows = mNrows;
-  c.mNcols = mNcols;
-
-  c.mNchannels = mNchannels;
-
-  c.mData = mData;
-}
diff --git a/Detectors/Vertexing/include/DetectorsVertexing/FwdDCAFitterN.h b/Detectors/Vertexing/include/DetectorsVertexing/FwdDCAFitterN.h
deleted file mode 100644
index d5bc6631575af..0000000000000
--- a/Detectors/Vertexing/include/DetectorsVertexing/FwdDCAFitterN.h
+++ /dev/null
@@ -1,1297 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file FwdDCAFitterN.h
-/// \brief Defintions for N-prongs secondary vertex fit
-/// \author ruben.shahoyan@cern.ch, adapted from central barrel to fwd rapidities by Rita Sadek, rita.sadek@cern.ch
-/// For the formulae derivation see /afs/cern.ch/user/s/shahoian/public/O2/DCAFitter/DCAFitterN.pdf
-
-#ifndef _ALICEO2_DCA_FWDFITTERN_
-#define _ALICEO2_DCA_FWDFITTERN_
-#include <TMath.h>
-#include "MathUtils/Cartesian.h"
-#include "ReconstructionDataFormats/TrackFwd.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "ReconstructionDataFormats/HelixHelper.h"
-#include <TRandom.h>
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-
-namespace o2
-{
-namespace vertexing
-{
-
-///__________________________________________________________________________________
-///< Fwd Inverse cov matrix (augmented by a dummy Z error) of the point defined by the track
-struct FwdTrackCovI {
-  float sxx, syy, sxy, szz;
-
-  FwdTrackCovI(const o2::track::TrackParCovFwd& trc, float zerrFactor = 1.) { set(trc, zerrFactor); }
-  FwdTrackCovI() = default;
-  void set(const o2::track::TrackParCovFwd& trc, float zerrFactor = 1)
-  {
-    float cxx = trc.getSigma2X(), cyy = trc.getSigma2Y(), cxy = trc.getSigmaXY(), czz = cyy * zerrFactor;
-    float detXY = cxx * cyy - cxy * cxy;
-    if (detXY > 0.) {
-      auto detXYI = 1. / detXY;
-      sxx = cyy * detXYI;
-      syy = cxx * detXYI;
-      sxy = -cxy * detXYI;
-      szz = 1. / czz;
-    } else {
-      throw std::runtime_error("invalid track covariance");
-    }
-  }
-};
-
-///__________________________________________________________________________
-///< Fwd derivative (up to 2) of the TrackParam position over its running param Z
-struct FwdTrackDeriv {
-  float dxdz, dydz, d2xdz2, d2ydz2;
-  FwdTrackDeriv() = default;
-  FwdTrackDeriv(const o2::track::TrackParFwd& trc, float bz) { set(trc, bz); }
-  void set(const o2::track::TrackParFwd& trc, float bz)
-  {
-    float snp = trc.getSnp(), csp = std::sqrt((1. - snp) * (1. + snp)), cspI = 1. / csp, crv2c = trc.getCurvature(bz), tgl = trc.getTanl(), tglI = 1. / tgl;
-    if (crv2c == 0.) {
-      crv2c = (trc.getCharge()) * 0.3 * bz * (-1e-3);
-    }
-
-    dxdz = csp * tglI;
-    dydz = snp * tglI;
-    d2xdz2 = crv2c * snp * tglI * tglI;
-    d2ydz2 = -crv2c * csp * tglI * tglI;
-  }
-};
-
-template <int N, typename... Args>
-class FwdDCAFitterN
-{
-  static constexpr double NMin = 2;
-  static constexpr double NMax = 4;
-  static constexpr double NInv = 1. / N;
-  static constexpr int MAXHYP = 2;
-  static constexpr float ZerrFactor = 5.; // factor for conversion of track covXX to dummy covZZ
-  using Track = o2::track::TrackParCovFwd;
-  using TrackAuxPar = o2::track::TrackAuxPar;
-  using CrossInfo = o2::track::CrossInfo;
-  using Vec3D = ROOT::Math::SVector<double, 3>;
-  using VecND = ROOT::Math::SVector<double, N>;
-  using MatSym3D = ROOT::Math::SMatrix<double, 3, 3, ROOT::Math::MatRepSym<double, 3>>;
-  using MatStd3D = ROOT::Math::SMatrix<double, 3, 3, ROOT::Math::MatRepStd<double, 3>>;
-  using MatSymND = ROOT::Math::SMatrix<double, N, N, ROOT::Math::MatRepSym<double, N>>;
-  using MatStdND = ROOT::Math::SMatrix<double, N, N, ROOT::Math::MatRepStd<double, N>>;
-  using SMatrix55 = ROOT::Math::SMatrix<double, 5, 5, ROOT::Math::MatRepSym<double, 5>>;
-  using TrackCoefVtx = MatStd3D;
-  using ArrTrack = std::array<Track, N>;            // container for prongs (tracks) at single vertex cand.
-  using ArrTrackCovI = std::array<FwdTrackCovI, N>; // container for inv.cov.matrices at single vertex cand.
-  using ArrTrCoef = std::array<TrackCoefVtx, N>;    // container of TrackCoefVtx coefficients at single vertex cand.
-  using ArrTrDer = std::array<FwdTrackDeriv, N>;    // container of Track 1st and 2nd derivative over their Z param
-  using ArrTrPos = std::array<Vec3D, N>;            // container of Track positions
-
- public:
-  static constexpr int getNProngs() { return N; }
-
-  FwdDCAFitterN() = default;
-  FwdDCAFitterN(float bz, bool useAbsDCA, bool prop2DCA) : mBz(bz), mUseAbsDCA(useAbsDCA), mPropagateToPCA(prop2DCA)
-  {
-    static_assert(N >= NMin && N <= NMax, "N prongs outside of allowed range");
-  }
-
-  //=========================================================================
-  ///< return PCA candidate, by default best on is provided (no check for the index validity)
-  const Vec3D& getPCACandidate(int cand = 0) const { return mPCA[mOrder[cand]]; }
-  const auto getPCACandidatePos(int cand = 0) const
-  {
-    const auto& vd = mPCA[mOrder[cand]];
-    return std::array<float, 3>{float(vd[0]), float(vd[1]), float(vd[2])};
-  }
-
-  ///< return Chi2 at PCA candidate (no check for its validity)
-  float getChi2AtPCACandidate(int cand = 0) const { return mChi2[mOrder[cand]]; }
-
-  ///< prepare copies of tracks at the V0 candidate (no check for the candidate validity)
-  ///  must be called before getTrack(i,cand) query
-  bool FwdpropagateTracksToVertex(int cand = 0);
-
-  ///< check if propagation of tracks to candidate vertex was done
-  bool isPropagateTracksToVertexDone(int cand = 0) const { return mTrPropDone[mOrder[cand]]; }
-
-  ///< track param propagated to V0 candidate (no check for the candidate validity)
-  ///  propagateTracksToVertex must be called in advance
-  Track& getTrack(int i, int cand = 0)
-  {
-    if (!mTrPropDone[mOrder[cand]]) {
-      throw std::runtime_error("propagateTracksToVertex was not called yet");
-    }
-    return mCandTr[mOrder[cand]][i];
-  }
-
-  ///< calculate on the fly track param (no cov mat) at candidate
-  o2::track::TrackParFwd FwdgetTrackParamAtPCA(int i, int cand = 0) const;
-
-  MatSym3D calcPCACovMatrix(int cand = 0) const;
-
-  std::array<float, 6> calcPCACovMatrixFlat(int cand = 0) const
-  {
-    auto m = calcPCACovMatrix(cand);
-    return {float(m(0, 0)), float(m(1, 0)), float(m(1, 1)), float(m(2, 0)), float(m(2, 1)), float(m(2, 2))};
-  }
-
-  const Track* getOrigTrackPtr(int i) const { return mOrigTrPtr[i]; }
-
-  ///< return number of iterations during minimization (no check for its validity)
-  int getNIterations(int cand = 0) const { return mNIters[mOrder[cand]]; }
-  void setPropagateToPCA(bool v = true) { mPropagateToPCA = v; }
-  void setMaxIter(int n = 60) { mMaxIter = n > 2 ? n : 2; }
-  void setMaxR(float r = 200.) { mMaxR2 = r * r; }
-  void setMaxDXIni(float d = 4.) { mMaxDXIni = d; }
-  void setMaxChi2(float chi2 = 999.) { mMaxChi2 = chi2; }
-  void setBz(float bz) { mBz = std::abs(bz) > o2::constants::math::Almost0 ? bz : 0.f; }
-  void setMinParamChange(float x = 1e-3) { mMinParamChange = x > 1e-4 ? x : 1.e-4; }
-  void setMinRelChi2Change(float r = 0.9) { mMinRelChi2Change = r > 0.1 ? r : 999.; }
-  void setUseAbsDCA(bool v) { mUseAbsDCA = v; }
-  void setMatLUT(const o2::base::MatLayerCylSet* m)
-  {
-    mMatLUT = m;
-    mUseMatBudget = true;
-  }
-  void setTGeoMat(bool v = true) { mTGeoFallBackAllowed = v; }
-  void setMaxDistance2ToMerge(float v) { mMaxDist2ToMergeSeeds = v; }
-
-  int getNCandidates() const { return mCurHyp; }
-  int getMaxIter() const { return mMaxIter; }
-  float getMaxR() const { return std::sqrt(mMaxR2); }
-  float getMaxDXIni() const { return mMaxDXIni; }
-  float getMaxChi2() const { return mMaxChi2; }
-  float getMinParamChange() const { return mMinParamChange; }
-  float getBz() const { return mBz; }
-  double getK(double b) const { return std::abs(o2::constants::math::B2C * b); }
-  double getHz(double b) const { return std::copysign(1, b); }
-
-  float getMaxDistance2ToMerge() const { return mMaxDist2ToMergeSeeds; }
-  bool getUseAbsDCA() const { return mUseAbsDCA; }
-  bool getPropagateToPCA() const { return mPropagateToPCA; }
-
-  template <class... Tr>
-  int process(const Tr&... args);
-  void print() const;
-
- protected:
-  bool FwdcalcPCACoefs();
-  bool FwdcalcInverseWeight();
-  void FwdcalcResidDerivatives();
-  void FwdcalcResidDerivativesNoErr();
-  void FwdcalcChi2Derivatives();
-  void FwdcalcChi2DerivativesNoErr();
-  void FwdcalcPCA();
-  void FwdcalcPCANoErr();
-  void FwdcalcTrackResiduals();
-  void calcTrackDerivatives();
-  float findZatXY(int cand = 0);
-  void findZatXY_mid(int cand = 0);
-  void findZatXY_lineApprox(int cand = 0);
-  void findZatXY_quad(int cand = 0);
-  void findZatXY_linear(int cand = 0);
-  double FwdcalcChi2() const;
-  double FwdcalcChi2NoErr() const;
-  bool FwdcorrectTracks(const VecND& corrZ);
-  bool minimizeChi2();
-  bool minimizeChi2NoErr();
-  bool roughDXCut() const;
-  bool closerToAlternative() const;
-  static double getAbsMax(const VecND& v);
-  bool propagateToVtx(o2::track::TrackParCovFwd& t, const std::array<float, 3>& p, const std::array<float, 2>& cov) const;
-
-  ///< track param positions at V0 candidate (no check for the candidate validity)
-  const Vec3D& getTrackPos(int i, int cand = 0) const { return mTrPos[mOrder[cand]][i]; }
-
-  ///< track Z-param at V0 candidate (no check for the candidate validity)
-  float getTrackZ(int i, int cand = 0) const { return getTrackPos(i, cand)[2]; }
-
-  MatStd3D getTrackRotMatrix(int i) const // generate 3D matrix for track rotation to global frame
-  // no rotation for fwd: mat=I
-  {
-    MatStd3D mat;
-    mat(0, 0) = 1;
-    mat(1, 1) = 1;
-    mat(2, 2) = 1;
-    return mat;
-  }
-
-  MatSym3D getTrackCovMatrix(int i, int cand = 0) const // generate covariance matrix of track position, adding fake Z error
-  {
-    const auto& trc = mCandTr[mOrder[cand]][i];
-    MatSym3D mat;
-    mat(0, 0) = trc.getSigma2X();
-    mat(1, 1) = trc.getSigma2Y();
-    mat(1, 0) = trc.getSigmaXY();
-    mat(2, 2) = trc.getSigma2Y() * ZerrFactor;
-    return mat;
-  }
-
-  void assign(int) {}
-  template <class T, class... Tr>
-  void assign(int i, const T& t, const Tr&... args)
-  {
-    static_assert(std::is_convertible<T, Track>(), "Wrong track type");
-    mOrigTrPtr[i] = &t;
-    assign(i + 1, args...);
-  }
-
-  void clear()
-  {
-    mCurHyp = 0;
-    mAllowAltPreference = true;
-  }
-
-  static void setTrackPos(Vec3D& pnt, const Track& tr)
-  {
-    pnt[0] = tr.getX();
-    pnt[1] = tr.getY();
-    pnt[2] = tr.getZ();
-  }
-
- private:
-  // vectors of 1st derivatives of track local residuals over Z parameters
-  std::array<std::array<Vec3D, N>, N> mDResidDz;
-  // vectors of 1nd derivatives of track local residuals over Z parameters
-  std::array<std::array<Vec3D, N>, N> mD2ResidDz2;
-  VecND mDChi2Dz;      // 1st derivatives of chi2 over tracks Z params
-  MatSymND mD2Chi2Dz2; // 2nd derivatives of chi2 over tracks Z params (symmetric matrix)
-
-  std::array<const Track*, N> mOrigTrPtr;
-  std::array<TrackAuxPar, N> mTrAux; // Aux track info for each track at each cand. vertex
-  CrossInfo mCrossings;              // info on track crossing
-
-  std::array<ArrTrackCovI, MAXHYP> mTrcEInv; // errors for each track at each cand. vertex
-  std::array<ArrTrack, MAXHYP> mCandTr;      // tracks at each cond. vertex (Note: Errors are at seed XY point)
-  std::array<ArrTrCoef, MAXHYP> mTrCFVT;     // TrackCoefVtx for each track at each cand. vertex
-  std::array<ArrTrDer, MAXHYP> mTrDer;       // Track derivativse
-  std::array<ArrTrPos, MAXHYP> mTrPos;       // Track positions
-  std::array<ArrTrPos, MAXHYP> mTrRes;       // Track residuals
-  std::array<Vec3D, MAXHYP> mPCA;            // PCA for each vertex candidate
-  std::array<float, MAXHYP> mChi2 = {0};     // Chi2 at PCA candidate
-  std::array<int, MAXHYP> mNIters;           // number of iterations for each seed
-  std::array<bool, MAXHYP> mTrPropDone;      // Flag that the tracks are fully propagated to PCA
-  MatSym3D mWeightInv;                       // inverse weight of single track, [sum{M^T E M}]^-1 in EQ.T
-  std::array<int, MAXHYP> mOrder{0};
-  int mCurHyp = 0;
-  int mCrossIDCur = 0;
-  int mCrossIDAlt = -1;
-  bool mAllowAltPreference = true;  // if the fit converges to alternative PCA seed, abandon the current one
-  bool mUseAbsDCA = false;          // use abs. distance minimization rather than chi2
-  bool mPropagateToPCA = true;      // create tracks version propagated to PCA
-  bool mUseMatBudget = false;       // include MCS effects in track propagation
-  bool mTGeoFallBackAllowed = true; // use TGeo for precise estimate of mat. budget
-  int mMaxIter = 60;                // max number of iterations
-  float mBz = 0;                    // bz field, to be set by user
-  float mMaxR2 = 200. * 200.;       // reject PCA's above this radius
-  float mMaxDXIni = 4.;             // reject (if>0) PCA candidate if tracks DZ exceeds threshold
-  float mMinParamChange = 1e-5;     // stop iterations if largest change of any X is smaller than this
-  float mMinRelChi2Change = 0.98;   // stop iterations is chi2/chi2old > this
-  float mMaxChi2 = 100;             // abs cut on chi2 or abs distance
-  float mMaxDist2ToMergeSeeds = 1.; // merge 2 seeds to their average if their distance^2 is below the threshold
-  const o2::base::MatLayerCylSet* mMatLUT = nullptr; // use to compute material budget to include MCS effects
-
-  ClassDefNV(FwdDCAFitterN, 1);
-};
-
-///_________________________________________________________________________
-template <int N, typename... Args>
-template <class... Tr>
-int FwdDCAFitterN<N, Args...>::process(const Tr&... args)
-{
-
-  static_assert(sizeof...(args) == N, "incorrect number of input tracks");
-  assign(0, args...);
-  clear();
-
-  for (int i = 0; i < N; i++) {
-    mTrAux[i].set(*mOrigTrPtr[i], mBz);
-  }
-
-  if (!mCrossings.set(mTrAux[0], *mOrigTrPtr[0], mTrAux[1], *mOrigTrPtr[1])) { // even for N>2 it should be enough to test just 1 loop
-    return 0;                                                                  // no crossing
-  }
-
-  if (mCrossings.nDCA == MAXHYP) { // if there are 2 candidates
-    auto dst2 = (mCrossings.xDCA[0] - mCrossings.xDCA[1]) * (mCrossings.xDCA[0] - mCrossings.xDCA[1]) +
-                (mCrossings.yDCA[0] - mCrossings.yDCA[1]) * (mCrossings.yDCA[0] - mCrossings.yDCA[1]);
-
-    if (dst2 < mMaxDist2ToMergeSeeds) {
-      mCrossings.nDCA = 1;
-      mCrossings.xDCA[0] = 0.5 * (mCrossings.xDCA[0] + mCrossings.xDCA[1]);
-      mCrossings.yDCA[0] = 0.5 * (mCrossings.yDCA[0] + mCrossings.yDCA[1]);
-    }
-  }
-
-  // check all crossings
-  for (int ic = 0; ic < mCrossings.nDCA; ic++) {
-    // check if radius is acceptable
-    if (mCrossings.xDCA[ic] * mCrossings.xDCA[ic] + mCrossings.yDCA[ic] * mCrossings.yDCA[ic] > mMaxR2) {
-      continue;
-    }
-
-    mCrossIDCur = ic;
-    mCrossIDAlt = (mCrossings.nDCA == 2 && mAllowAltPreference) ? 1 - ic : -1; // works for max 2 crossings
-    mNIters[mCurHyp] = 0;
-    mTrPropDone[mCurHyp] = false;
-    mChi2[mCurHyp] = -1.;
-
-    findZatXY_mid(mCurHyp);
-
-    if (mUseAbsDCA ? minimizeChi2NoErr() : minimizeChi2()) {
-      mOrder[mCurHyp] = mCurHyp;
-      if (mPropagateToPCA && !FwdpropagateTracksToVertex(mCurHyp)) {
-        continue;
-      }
-      mCurHyp++;
-    }
-  }
-
-  for (int i = mCurHyp; i--;) { // order in quality
-    for (int j = i; j--;) {
-      if (mChi2[mOrder[i]] < mChi2[mOrder[j]]) {
-        std::swap(mOrder[i], mOrder[j]);
-      }
-    }
-  }
-
-  return mCurHyp;
-}
-
-//__________________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::FwdcalcPCACoefs()
-{
-  //< calculate Ti matrices for global vertex decomposition to V = sum_{0<i<N} Ti pi, see EQ.T in the ref
-  if (!FwdcalcInverseWeight()) {
-    return false;
-  }
-  for (int i = N; i--;) { // build Mi*Ei matrix, with Mi = I
-    const auto& tcov = mTrcEInv[mCurHyp][i];
-    MatStd3D miei;
-
-    miei[0][0] = tcov.sxx;
-    miei[0][1] = tcov.sxy;
-    miei[1][0] = tcov.sxy;
-    miei[1][1] = tcov.syy;
-    miei[2][2] = tcov.szz;
-
-    mTrCFVT[mCurHyp][i] = mWeightInv * miei;
-  }
-  return true;
-}
-
-//__________________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::FwdcalcInverseWeight()
-{
-  //< calculate [sum_{0<j<N} M_j*E_j*M_j^T]^-1 used for Ti matrices, see EQ.T, with M_i = I
-  auto* arrmat = mWeightInv.Array();
-  memset(arrmat, 0, sizeof(mWeightInv));
-  enum { XX,
-         XY,
-         YY,
-         XZ,
-         YZ,
-         ZZ };
-  for (int i = N; i--;) {
-    const auto& tcov = mTrcEInv[mCurHyp][i];
-    arrmat[XX] += tcov.sxx;
-    arrmat[XY] += tcov.sxy;
-    arrmat[XZ] += 0;
-    arrmat[YY] += tcov.syy;
-    arrmat[YZ] += 0;
-    arrmat[ZZ] += tcov.szz;
-  }
-
-  // invert 3x3 symmetrix matrix
-  return mWeightInv.Invert();
-}
-
-//__________________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcResidDerivatives()
-{
-  //< calculate matrix of derivatives for weighted chi2: residual i vs parameter Z of track j
-  MatStd3D matMT;
-  for (int i = N; i--;) { // residual being differentiated
-    // const auto& taux = mTrAux[i];
-    for (int j = N; j--;) {                   // track over which we differentiate
-      const auto& matT = mTrCFVT[mCurHyp][j]; // coefficient matrix for track J
-      const auto& trDz = mTrDer[mCurHyp][j];  // track point derivs over track Z param
-      auto& dr1 = mDResidDz[i][j];
-      auto& dr2 = mD2ResidDz2[i][j];
-      // calculate M_i^transverse * T_j , M_i^transverse=I -> MT=T
-      matMT[0][0] = matT[0][0];
-      matMT[0][1] = matT[0][1];
-      matMT[0][2] = matT[0][2];
-      matMT[1][0] = matT[1][0];
-      matMT[1][1] = matT[1][1];
-      matMT[1][2] = matT[1][2];
-      matMT[2][0] = matT[2][0];
-      matMT[2][1] = matT[2][1];
-      matMT[2][2] = matT[2][2];
-
-      // calculate DResid_i/Dz_j = (delta_ij - M_i^tr * T_j) * DTrack_k/Dz_k
-      dr1[0] = -(matMT[0][0] * trDz.dxdz + matMT[0][1] * trDz.dydz + matMT[0][2]);
-      dr1[1] = -(matMT[1][0] * trDz.dxdz + matMT[1][1] * trDz.dydz + matMT[1][2]);
-      dr1[2] = -(matMT[2][0] * trDz.dxdz + matMT[2][1] * trDz.dydz + matMT[2][2]);
-
-      // calculate D2Resid_I/(Dz_J Dz_K) = (delta_ijk - M_i^tr * T_j * delta_jk) * D2Track_k/dz_k^2
-      dr2[0] = -(matMT[0][1] * trDz.d2ydz2 + matMT[0][0] * trDz.d2xdz2);
-      dr2[1] = -(matMT[1][1] * trDz.d2ydz2 + matMT[1][0] * trDz.d2xdz2);
-      dr2[2] = -(matMT[2][1] * trDz.d2ydz2 + matMT[2][0] * trDz.d2xdz2);
-
-      if (i == j) {
-        dr1[0] += trDz.dxdz;
-        dr1[1] += trDz.dydz;
-        dr1[2] += 1.;
-
-        dr2[0] += trDz.d2xdz2;
-        dr2[1] += trDz.d2ydz2;
-      }
-    } // track over which we differentiate
-  }   // residual being differentiated
-}
-
-//__________________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcResidDerivativesNoErr()
-{
-  //< calculate matrix of derivatives for absolute distance chi2: residual i vs parameter Z of track j
-  constexpr double NInv1 = 1. - NInv;       // profit from Rii = I/Ninv
-  for (int i = N; i--;) {                   // residual being differentiated
-    const auto& trDzi = mTrDer[mCurHyp][i]; // track point derivs over track Z param
-    auto& dr1ii = mDResidDz[i][i];
-    auto& dr2ii = mD2ResidDz2[i][i];
-
-    dr1ii[0] = NInv1 * trDzi.dxdz;
-    dr1ii[1] = NInv1 * trDzi.dydz;
-    dr1ii[2] = NInv1;
-
-    dr2ii[0] = NInv1 * trDzi.d2xdz2;
-    dr2ii[1] = NInv1 * trDzi.d2ydz2;
-    dr2ii[2] = 0;
-
-    for (int j = i; j--;) { // track over which we differentiate
-      auto& dr1ij = mDResidDz[i][j];
-      auto& dr1ji = mDResidDz[j][i];
-      const auto& trDzj = mTrDer[mCurHyp][j]; // track point derivs over track Z param
-
-      // calculate DResid_i/Dz_j = (delta_ij - R_ij) * DTrack_j/Dz_j  for j<i
-      dr1ij[0] = -trDzj.dxdz * NInv;
-      dr1ij[1] = -trDzj.dydz * NInv;
-      dr1ij[2] = -1 * NInv;
-
-      // calculate DResid_j/Dz_i = (delta_ij - R_ji) * DTrack_i/Dz_i  for j<i
-      dr1ji[0] = -trDzi.dxdz * NInv;
-      dr1ji[1] = -trDzi.dydz * NInv;
-      dr1ji[2] = -1 * NInv;
-
-      auto& dr2ij = mD2ResidDz2[i][j];
-      auto& dr2ji = mD2ResidDz2[j][i];
-
-      // calculate D2Resid_I/(Dz_J Dz_K) = (delta_ij - Rij) * D2Track_j/dz_j^2 * delta_jk for j<i
-      dr2ij[0] = -trDzj.d2xdz2 * NInv;
-      dr2ij[1] = -trDzj.d2ydz2 * NInv;
-      dr2ij[2] = 0;
-
-      // calculate D2Resid_j/(Dz_i Dz_k) = (delta_ij - Rji) * D2Track_i/dz_i^2 * delta_ik for j<i
-      dr2ji[0] = -trDzi.d2xdz2 * NInv;
-      dr2ji[1] = -trDzi.d2ydz2 * NInv;
-      dr2ji[2] = 0;
-
-    } // track over which we differentiate
-  }   // residual being differentiated
-}
-
-//__________________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcChi2Derivatives()
-{
-  //< calculate 1st and 2nd derivatives of wighted DCA (chi2) over track parameters Z
-  std::array<std::array<Vec3D, N>, N> covIDrDz; // tempory vectors of covI_j * dres_j/dz_i
-
-  // chi2 1st derivative
-  for (int i = N; i--;) {
-    auto& dchi1 = mDChi2Dz[i]; // DChi2/Dz_i = sum_j { res_j * covI_j * Dres_j/Dz_i }
-    dchi1 = 0;
-    for (int j = N; j--;) {
-      const auto& res = mTrRes[mCurHyp][j];    // vector of residuals of track j
-      const auto& covI = mTrcEInv[mCurHyp][j]; // inverse cov matrix of track j
-      const auto& dr1 = mDResidDz[j][i];       // vector of j-th residuals 1st derivative over Z param of track i
-      auto& cidr = covIDrDz[i][j];             // vector covI_j * dres_j/dz_i, save for 2nd derivative calculation
-      cidr[0] = covI.sxx * dr1[0] + covI.sxy * dr1[1];
-      cidr[1] = covI.sxy * dr1[0] + covI.syy * dr1[1];
-      cidr[2] = covI.szz * dr1[2];
-
-      dchi1 += ROOT::Math::Dot(res, cidr);
-    }
-  }
-
-  // chi2 2nd derivative
-  for (int i = N; i--;) {
-    for (int j = i + 1; j--;) {       // symmetric matrix
-      auto& dchi2 = mD2Chi2Dz2[i][j]; // D2Chi2/Dz_i/Dz_j = sum_k { Dres_k/Dz_j * covI_k * Dres_k/Dz_i + res_k * covI_k * D2res_k/Dz_i/Dz_j }
-      dchi2 = 0;
-      for (int k = N; k--;) {
-        const auto& dr1j = mDResidDz[k][j];  // vector of k-th residuals 1st derivative over Z param of track j
-        const auto& cidrkj = covIDrDz[i][k]; // vector covI_k * dres_k/dz_i
-        dchi2 += ROOT::Math::Dot(dr1j, cidrkj);
-        if (k == j) {
-          const auto& res = mTrRes[mCurHyp][k];    // vector of residuals of track k
-          const auto& covI = mTrcEInv[mCurHyp][k]; // inverse cov matrix of track k
-          const auto& dr2ij = mD2ResidDz2[k][j];   // vector of k-th residuals 2nd derivative over Z params of track j
-          dchi2 += res[0] * (covI.sxx * dr2ij[0] + covI.sxy * dr2ij[1]) + res[1] * (covI.sxy * dr2ij[0] + covI.syy * dr2ij[1]) + res[2] * covI.szz * dr2ij[2];
-        }
-      }
-    }
-  }
-}
-
-//__________________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcChi2DerivativesNoErr()
-{
-  //< calculate 1st and 2nd derivatives of abs DCA (chi2) over track parameters Z
-  for (int i = N; i--;) {
-    auto& dchi1 = mDChi2Dz[i]; // DChi2/Dz_i = sum_j { res_j * Dres_j/Dz_i }
-    dchi1 = 0;                 // chi2 1st derivative
-    for (int j = N; j--;) {
-      const auto& res = mTrRes[mCurHyp][j]; // vector of residuals of track j
-      const auto& dr1 = mDResidDz[j][i];    // vector of j-th residuals 1st derivative over Z param of track i
-      dchi1 += ROOT::Math::Dot(res, dr1);
-      if (i >= j) { // symmetrix matrix
-        // chi2 2nd derivative
-        auto& dchi2 = mD2Chi2Dz2[i][j]; // D2Chi2/Dz_i/Dz_j = sum_k { Dres_k/Dz_j * covI_k * Dres_k/Dz_i + res_k * covI_k * D2res_k/Dz_i/Dz_j }
-        dchi2 = ROOT::Math::Dot(mTrRes[mCurHyp][i], mD2ResidDz2[i][j]);
-        for (int k = N; k--;) {
-          dchi2 += ROOT::Math::Dot(mDResidDz[k][i], mDResidDz[k][j]);
-        }
-      }
-    }
-  }
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcPCA()
-{
-  // calculate point of closest approach for N prongs
-  // calculating V = sum (Ti*Pi)
-  mPCA[mCurHyp] = mTrCFVT[mCurHyp][N - 1] * mTrPos[mCurHyp][N - 1];
-  for (int i = N - 1; i--;) {
-    mPCA[mCurHyp] += mTrCFVT[mCurHyp][i] * mTrPos[mCurHyp][i];
-  }
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcPCANoErr()
-{
-  // calculate point of closest approach for N prongs w/o errors
-  auto& pca = mPCA[mCurHyp];
-
-  pca[0] = mTrPos[mCurHyp][N - 1][0];
-  pca[1] = mTrPos[mCurHyp][N - 1][1];
-  pca[2] = mTrPos[mCurHyp][N - 1][2];
-
-  for (int i = N - 1; i--;) {
-    pca[0] += mTrPos[mCurHyp][i][0];
-    pca[1] += mTrPos[mCurHyp][i][1];
-    pca[2] += mTrPos[mCurHyp][i][2];
-  }
-  pca[0] *= NInv;
-  pca[1] *= NInv;
-  pca[2] *= NInv;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-ROOT::Math::SMatrix<double, 3, 3, ROOT::Math::MatRepSym<double, 3>> FwdDCAFitterN<N, Args...>::calcPCACovMatrix(int cand) const
-{
-  // calculate covariance matrix for the point of closest approach
-  MatSym3D covm;
-  for (int i = N; i--;) {
-    covm += ROOT::Math::Similarity(mUseAbsDCA ? getTrackRotMatrix(i) : mTrCFVT[mOrder[cand]][i], getTrackCovMatrix(i, cand));
-  }
-  return covm;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::FwdcalcTrackResiduals()
-{
-  // calculate residuals, res = Pi - V
-  Vec3D vtxLoc;
-  for (int i = N; i--;) {
-    mTrRes[mCurHyp][i] = mTrPos[mCurHyp][i];
-    vtxLoc = mPCA[mCurHyp];
-    mTrRes[mCurHyp][i] -= vtxLoc;
-  }
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-inline void FwdDCAFitterN<N, Args...>::calcTrackDerivatives()
-{
-  // calculate track derivatives over Z param
-  for (int i = N; i--;) {
-    mTrDer[mCurHyp][i].set(mCandTr[mCurHyp][i], mBz);
-  }
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-inline double FwdDCAFitterN<N, Args...>::FwdcalcChi2() const
-{
-  // calculate current chi2
-  double chi2 = 0;
-  for (int i = N; i--;) {
-    const auto& res = mTrRes[mCurHyp][i];
-    const auto& covI = mTrcEInv[mCurHyp][i];
-    chi2 += res[0] * res[0] * covI.sxx + res[1] * res[1] * covI.syy + res[2] * res[2] * covI.szz + 2. * res[0] * res[1] * covI.sxy;
-  }
-  return chi2;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-inline double FwdDCAFitterN<N, Args...>::FwdcalcChi2NoErr() const
-{
-  // calculate current chi2 of abs. distance minimization
-  double chi2 = 0;
-  for (int i = N; i--;) {
-    const auto& res = mTrRes[mCurHyp][i];
-    chi2 += res[0] * res[0] + res[1] * res[1] + res[2] * res[2];
-  }
-  return chi2;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::FwdcorrectTracks(const VecND& corrZ)
-{
-  // propagate tracks to updated Z
-  for (int i = N; i--;) {
-    const auto& trDer = mTrDer[mCurHyp][i];
-    auto dz2h = 0.5 * corrZ[i] * corrZ[i];
-    mTrPos[mCurHyp][i][0] -= trDer.dxdz * corrZ[i] - dz2h * trDer.d2xdz2;
-    mTrPos[mCurHyp][i][1] -= trDer.dydz * corrZ[i] - dz2h * trDer.d2ydz2;
-    mTrPos[mCurHyp][i][2] -= corrZ[i];
-  }
-
-  return true;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::FwdpropagateTracksToVertex(int icand)
-{
-  // propagate on z axis to vertex
-  int ord = mOrder[icand];
-  if (mTrPropDone[ord]) {
-    return true;
-  }
-  const Vec3D& pca = mPCA[ord];
-  std::array<float, 6> covMatrixPCA = calcPCACovMatrixFlat(ord);
-  std::array<float, 2> cov = {covMatrixPCA[0], covMatrixPCA[2]};
-  for (int i = N; i--;) {
-    mCandTr[ord][i] = *mOrigTrPtr[i]; // fetch the track again, as mCandTr might have been propagated w/o errors
-    auto& trc = mCandTr[ord][i];
-    const std::array<float, 3> p = {(float)pca[0], (float)pca[1], (float)pca[2]};
-    if (!propagateToVtx(trc, p, cov)) {
-      return false;
-    }
-  }
-
-  mTrPropDone[ord] = true;
-  return true;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-float FwdDCAFitterN<N, Args...>::findZatXY(int mCurHyp) // Between 2 tracks
-{
-
-  double step = 0.001;     // initial step
-  double startPoint = 20.; // first MFT disk
-
-  double z[2] = {startPoint, startPoint};
-  double newX[2], newY[2];
-
-  double X = mPCA[mCurHyp][0]; // X seed
-  double Y = mPCA[mCurHyp][1]; // Y seed
-
-  mCandTr[mCurHyp][0] = *mOrigTrPtr[0];
-  mCandTr[mCurHyp][1] = *mOrigTrPtr[1];
-
-  double dstXY[2][3] = {{999., 999., 999.}, {999., 999., 999.}};
-
-  double Z[2];
-  double finalZ[2];
-
-  double newDstXY;
-
-  for (int i = 0; i < 2; i++) {
-
-    while (z[i] > -10) {
-
-      mCandTr[mCurHyp][i].propagateParamToZquadratic(z[i], mBz);
-      newX[i] = mCandTr[mCurHyp][i].getX();
-      newY[i] = mCandTr[mCurHyp][i].getY();
-
-      newDstXY = std::sqrt((newX[i] - X) * (newX[i] - X) +
-                           (newY[i] - Y) * (newY[i] - Y));
-
-      // Update points
-      dstXY[i][0] = dstXY[i][1];
-      dstXY[i][1] = dstXY[i][2];
-      dstXY[i][2] = newDstXY;
-
-      if (dstXY[i][2] > dstXY[i][1] && dstXY[i][1] < dstXY[i][0]) {
-        finalZ[i] = z[i] + step;
-        break;
-      }
-
-      z[i] -= step;
-    }
-  }
-
-  float rez = 0.5 * (finalZ[0] + finalZ[1]);
-  return rez;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::findZatXY_mid(int mCurHyp)
-{
-  // look into dXY of T0 - T1 between 2 points(0,40cm); the one with the highest dXY is moved to mid
-
-  double startPoint = -40.;
-  double endPoint = 50.;
-  double midPoint = 0.5 * (startPoint + endPoint);
-
-  double z[2][2] = {{startPoint, endPoint}, {startPoint, endPoint}}; // z for tracks 0/1 on starting poing and endpoint
-
-  double DeltaZ = std::abs(endPoint - startPoint);
-
-  double newX[2][2];
-  double newY[2][2];
-
-  double epsilon = 0.0001;
-
-  double X = mPCA[mCurHyp][0]; // X seed
-  double Y = mPCA[mCurHyp][1]; // Y seed
-
-  mCandTr[mCurHyp][0] = *mOrigTrPtr[0];
-  mCandTr[mCurHyp][1] = *mOrigTrPtr[1];
-
-  double finalZ;
-
-  double dstXY[2]; // 0 -> distance btwn both tracks at startPoint
-
-  while (DeltaZ > epsilon) {
-
-    midPoint = 0.5 * (startPoint + endPoint);
-
-    for (int i = 0; i < 2; i++) {
-      mCandTr[mCurHyp][i].propagateParamToZquadratic(startPoint, mBz);
-      newX[i][0] = mCandTr[mCurHyp][i].getX();
-      newY[i][0] = mCandTr[mCurHyp][i].getY();
-
-      mCandTr[mCurHyp][i].propagateParamToZquadratic(endPoint, mBz);
-      newX[i][1] = mCandTr[mCurHyp][i].getX();
-      newY[i][1] = mCandTr[mCurHyp][i].getY();
-    }
-
-    dstXY[0] = (newX[0][0] - newX[1][0]) * (newX[0][0] - newX[1][0]) +
-               (newY[0][0] - newY[1][0]) * (newY[0][0] - newY[1][0]);
-
-    dstXY[1] = (newX[0][1] - newX[1][1]) * (newX[0][1] - newX[1][1]) +
-               (newY[0][1] - newY[1][1]) * (newY[0][1] - newY[1][1]);
-
-    DeltaZ = std::abs(endPoint - startPoint);
-
-    if (DeltaZ < epsilon) {
-      finalZ = 0.5 * (startPoint + endPoint);
-      break;
-    }
-
-    // chose new start and end Point according to the smallest D_XY
-    if (dstXY[1] > dstXY[0]) {
-      endPoint = midPoint;
-    } else {
-      startPoint = midPoint;
-    }
-  }
-
-  mPCA[mCurHyp][2] = finalZ;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::findZatXY_lineApprox(int mCurHyp)
-{
-  // approx method: z=(b-b')/(a'-a) -> tracks to lines with y0,1=az0,1+b for each track (in YZ and XZ plane)
-
-  double startPoint = 1.;
-  double endPoint = 50.; // first disk
-
-  double X = mPCA[mCurHyp][0]; // X seed
-  double Y = mPCA[mCurHyp][1]; // Y seed
-
-  mCandTr[mCurHyp][0] = *mOrigTrPtr[0];
-  mCandTr[mCurHyp][1] = *mOrigTrPtr[1];
-
-  double y[2][2]; // Y00: y track 0 at point 0; Y01: y track 0 at point 1
-  double z[2][2];
-  double x[2][2];
-
-  double aYZ[2];
-  double bYZ[2];
-
-  double aXZ[2];
-  double bXZ[2];
-
-  double finalZ;
-
-  // find points of the tracks = 2 straight lines
-  for (int i = 0; i < 2; i++) {
-
-    mCandTr[mCurHyp][i].propagateToZquadratic(startPoint, mBz);
-    //  mCandTr[mCurHyp][i].propagateToZlinear(startPoint);
-    z[i][0] = startPoint;
-    y[i][0] = mCandTr[mCurHyp][i].getY();
-    x[i][0] = mCandTr[mCurHyp][i].getX();
-
-    mCandTr[mCurHyp][i].propagateToZquadratic(endPoint, mBz);
-    //  mCandTr[mCurHyp][i].propagateToZlinear(endPoint);
-    z[i][1] = endPoint;
-    y[i][1] = mCandTr[mCurHyp][i].getY();
-    x[i][1] = mCandTr[mCurHyp][i].getX();
-
-    bYZ[i] = (y[i][1] - y[i][0] * z[i][1] / z[i][0]) / (1 - z[i][1] / z[i][0]);
-    aYZ[i] = (y[i][0] - bYZ[i]) / z[i][0];
-
-    bXZ[i] = (x[i][1] - x[i][0] * z[i][1] / z[i][0]) / (1 - z[i][1] / z[i][0]);
-    aXZ[i] = (x[i][0] - bXZ[i]) / z[i][0];
-  }
-
-  // z seed: equ. for intersection of these lines
-  finalZ = 0.5 * ((bYZ[0] - bYZ[1]) / (aYZ[1] - aYZ[0]) + (bXZ[0] - bXZ[1]) / (aXZ[1] - aXZ[0]));
-
-  mPCA[mCurHyp][2] = finalZ;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::findZatXY_quad(int mCurHyp)
-{
-  double startPoint = 0.;
-  double endPoint = 40.; // first disk
-
-  double X = mPCA[mCurHyp][0]; // X seed
-  double Y = mPCA[mCurHyp][1]; // Y seed
-
-  mCandTr[mCurHyp][0] = *mOrigTrPtr[0];
-  mCandTr[mCurHyp][1] = *mOrigTrPtr[1];
-
-  double x[2];
-  double y[2];
-  double sinPhi0[2];
-  double cosPhi0[2];
-  double tanL0[2];
-  double qpt0[2];
-
-  double k[2];  // B2C *abs(mBz)
-  double Hz[2]; // mBz/abs(mBz)
-
-  double Ax[2], Bx[2], Cx[2];
-  double Ay[2], By[2], Cy[2];
-
-  double deltaX[2], deltaY[2];
-
-  bool posX[2], nulX[2], negX[2];
-  double z1X[2], z2X[2], z12X[2];
-
-  bool posY[2], nulY[2], negY[2];
-  double z1Y[2], z2Y[2], z12Y[2];
-
-  double finalZ[2];
-
-  // find all variables for 2 tracks at z0 = startPoint
-  // set A, B, C variables for x/y equation for 2 tracks
-  // calculate Deltax/y for both and roots
-
-  for (int i = 0; i < 2; i++) {
-    mCandTr[mCurHyp][i].propagateToZquadratic(startPoint, mBz);
-    x[i] = mCandTr[mCurHyp][i].getX();
-    y[i] = mCandTr[mCurHyp][i].getY();
-    sinPhi0[i] = mCandTr[mCurHyp][i].getSnp();
-    cosPhi0[i] = std::sqrt((1. - sinPhi0[i]) * (1. + sinPhi0[i]));
-    tanL0[i] = mCandTr[mCurHyp][i].getTanl();
-    qpt0[i] = mCandTr[mCurHyp][i].getInvQPt();
-    k[i] = getK(mBz);
-    Hz[i] = getHz(mBz);
-
-    Ax[i] = qpt0[i] * Hz[i] * k[i] * sinPhi0[i] / (2 * tanL0[i] * tanL0[i]);
-    Bx[i] = cosPhi0[i] / tanL0[i];
-    Cx[i] = x[i] - X;
-
-    Ay[i] = -qpt0[i] * Hz[i] * k[i] * cosPhi0[i] / (2 * tanL0[i] * tanL0[i]);
-    By[i] = sinPhi0[i] / tanL0[i];
-    Cy[i] = y[i] - Y; //
-
-    deltaX[i] = Bx[i] * Bx[i] - 4 * Ax[i] * Cx[i];
-    deltaY[i] = By[i] * By[i] - 4 * Ay[i] * Cy[i];
-
-    if (deltaX[i] > 0) {
-      posX[i] = true;
-      z1X[i] = (-Bx[i] - std::sqrt(deltaX[i])) / (2 * Ax[i]);
-      z2X[i] = (-Bx[i] + std::sqrt(deltaX[i])) / (2 * Ax[i]);
-    } else if (deltaX[i] == 0) {
-      nulX[i] = true;
-      z12X[i] = -Bx[i] / (2 * Ax[i]);
-    } else {
-      negX[i] = true;
-      z12X[i] = 0;
-    } // discard
-
-    if (deltaY[i] > 0) {
-      posY[i] = true;
-      z1Y[i] = (-By[i] - std::sqrt(deltaY[i])) / (2 * Ay[i]);
-      z2Y[i] = (-By[i] + std::sqrt(deltaY[i])) / (2 * Ay[i]);
-    } else if (deltaX[i] == 0) {
-      nulY[i] = true;
-      z12Y[i] = -By[i] / (2 * Ay[i]);
-    } else {
-      negY[i] = true;
-      z12Y[i] = 0;
-    }
-
-    // find the z located in an acceptable interval
-    if (posX[i]) {
-      if (z1X[i] < endPoint && z1X[i] > startPoint) {
-        z12X[i] = z1X[i];
-      } else {
-        z12X[i] = z2X[i];
-      }
-    }
-
-    if (posY[i]) {
-      if (z1Y[i] < endPoint && z1Y[i] > startPoint) {
-        z12Y[i] = z1Y[i];
-      } else {
-        z12Y[i] = z2Y[i];
-      }
-    }
-
-    finalZ[i] = 0.5 * (z12X[i] + z12Y[i]);
-  }
-
-  mPCA[mCurHyp][2] = 0.5 * (finalZ[0] + finalZ[1]);
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::findZatXY_linear(int mCurHyp)
-{
-
-  double startPoint = 0.;
-
-  double X = mPCA[mCurHyp][0]; // X seed
-  double Y = mPCA[mCurHyp][1]; // Y seed
-
-  mCandTr[mCurHyp][0] = *mOrigTrPtr[0];
-  mCandTr[mCurHyp][1] = *mOrigTrPtr[1];
-
-  double x[2];
-  double y[2];
-  double sinPhi0[2];
-  double cosPhi0[2];
-  double tanL0[2];
-
-  double Ax[2], Bx[2];
-  double Ay[2], By[2];
-
-  double z12X[2];
-  double z12Y[2];
-
-  double finalZ[2];
-
-  // find all variables for 2 tracks at z0 = startPoint
-  // set A, B variables for x/y equation for 2 tracks
-  // calculate root
-
-  for (int i = 0; i < 2; i++) {
-    mCandTr[mCurHyp][i].propagateToZlinear(startPoint);
-    x[i] = mCandTr[mCurHyp][i].getX();
-    y[i] = mCandTr[mCurHyp][i].getY();
-    sinPhi0[i] = mCandTr[mCurHyp][i].getSnp();
-    cosPhi0[i] = std::sqrt((1. - sinPhi0[i]) * (1. + sinPhi0[i]));
-    tanL0[i] = mCandTr[mCurHyp][i].getTanl();
-
-    Ax[i] = cosPhi0[i] / tanL0[i];
-    Bx[i] = x[i] - X;
-
-    Ay[i] = sinPhi0[i] / tanL0[i];
-    By[i] = y[i] - Y;
-
-    z12X[i] = -Bx[i] / Ax[i];
-    z12Y[i] = -By[i] / Ay[i];
-
-    finalZ[i] = 0.5 * (z12X[i] + z12Y[i]);
-  }
-
-  mPCA[mCurHyp][2] = 0.5 * (finalZ[0] + finalZ[1]);
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-inline o2::track::TrackParFwd FwdDCAFitterN<N, Args...>::FwdgetTrackParamAtPCA(int i, int icand) const
-{
-  // propagate tracks param only to current vertex (if not already done)
-  int ord = mOrder[icand];
-  o2::track::TrackParFwd trc(mCandTr[ord][i]);
-  if (!mTrPropDone[ord]) {
-    auto z = mPCA[ord][2];
-    trc.propagateParamToZquadratic(z, mBz);
-  }
-
-  return {trc};
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-inline double FwdDCAFitterN<N, Args...>::getAbsMax(const VecND& v)
-{
-  double mx = -1;
-  for (int i = N; i--;) {
-    auto vai = std::abs(v[i]);
-    if (mx < vai) {
-      mx = vai;
-    }
-  }
-  return mx;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::minimizeChi2()
-{
-  // find best chi2 (weighted DCA) of N tracks in the vicinity of the seed PCA
-  double x[2], y[2];
-  double sumX = 0.;
-  double sumY = 0.;
-
-  for (int i = N; i--;) {
-    mCandTr[mCurHyp][i] = *mOrigTrPtr[i];
-    auto z = mPCA[mCurHyp][2];
-
-    mCandTr[mCurHyp][i].propagateToZquadratic(z, mBz);
-
-    x[i] = mCandTr[mCurHyp][i].getX();
-    y[i] = mCandTr[mCurHyp][i].getY();
-
-    setTrackPos(mTrPos[mCurHyp][i], mCandTr[mCurHyp][i]);      // prepare positions
-    mTrcEInv[mCurHyp][i].set(mCandTr[mCurHyp][i], ZerrFactor); // prepare inverse cov.matrices at starting point
-
-    sumX = sumX + x[i];
-    sumY = sumY + y[i];
-  }
-
-  mPCA[mCurHyp][0] = sumX / N;
-  mPCA[mCurHyp][1] = sumY / N;
-
-  if (mMaxDXIni > 0 && !roughDXCut()) { // apply rough cut on tracks X difference
-    return false;
-  }
-
-  if (!FwdcalcPCACoefs()) { // prepare tracks contribution matrices to the global PCA
-    return false;
-  }
-  FwdcalcPCA();            // current PCA
-  FwdcalcTrackResiduals(); // current track residuals
-  float chi2Upd, chi2 = FwdcalcChi2();
-  do {
-    calcTrackDerivatives();    // current track derivatives (1st and 2nd)
-    FwdcalcResidDerivatives(); // current residals derivatives (1st and 2nd)
-    FwdcalcChi2Derivatives();  // current chi2 derivatives (1st and 2nd) to proceed for dz calculation
-
-    // do Newton-Rapson iteration with corrections = - dchi2/d{x0..xN} * [ d^2chi2/d{x0..xN}^2 ]^-1
-    if (!mD2Chi2Dz2.Invert()) {
-      return false;
-    }
-
-    VecND dz = mD2Chi2Dz2 * mDChi2Dz;
-
-    if (!FwdcorrectTracks(dz)) { // calculate new Pi (mTrPos) following Newton-Rapson iteration
-      return false;
-    }
-
-    FwdcalcPCA(); // updated mPCA (new V coordinates with new mTrPos (Pi))
-    if (mCrossIDAlt >= 0 && closerToAlternative()) {
-      mAllowAltPreference = false;
-      return false;
-    }
-
-    FwdcalcTrackResiduals(); // updated residuals
-    chi2Upd = FwdcalcChi2(); // updated chi2
-
-    if (getAbsMax(dz) < mMinParamChange || chi2Upd > chi2 * mMinRelChi2Change) {
-      chi2 = chi2Upd;
-      break; // converged
-    }
-
-    chi2 = chi2Upd;
-  } while (++mNIters[mCurHyp] < mMaxIter);
-
-  mChi2[mCurHyp] = chi2 * NInv;
-  return mChi2[mCurHyp] < mMaxChi2;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::minimizeChi2NoErr()
-{
-  // find best chi2 (absolute DCA) of N tracks in the vicinity of the PCA seed
-  double x[2], y[2];
-  double sumX = 0.;
-  double sumY = 0.;
-
-  for (int i = N; i--;) {
-
-    mCandTr[mCurHyp][i] = *mOrigTrPtr[i];
-
-    auto z = mPCA[mCurHyp][2];
-    mCandTr[mCurHyp][i].propagateParamToZquadratic(z, mBz);
-
-    x[i] = mCandTr[mCurHyp][i].getX();
-    y[i] = mCandTr[mCurHyp][i].getY();
-
-    mPCA[mCurHyp][2] = z;
-
-    setTrackPos(mTrPos[mCurHyp][i], mCandTr[mCurHyp][i]); // prepare positions
-
-    sumX = sumX + x[i];
-    sumY = sumY + y[i];
-  }
-
-  mPCA[mCurHyp][0] = sumX / N;
-  mPCA[mCurHyp][1] = sumY / N;
-
-  if (mMaxDXIni > 0 && !roughDXCut()) { // apply rough cut on tracks Z difference
-    return false;
-  }
-
-  FwdcalcPCANoErr();       // current PCA
-  FwdcalcTrackResiduals(); // current track residuals
-  float chi2Upd, chi2 = FwdcalcChi2NoErr();
-  do {
-    calcTrackDerivatives();         // current track derivatives (1st and 2nd)
-    FwdcalcResidDerivativesNoErr(); // current residals derivatives (1st and 2nd)
-    FwdcalcChi2DerivativesNoErr();  // current chi2 derivatives (1st and 2nd)
-
-    // do Newton-Rapson iteration with corrections = - dchi2/d{x0..xN} * [ d^2chi2/d{x0..xN}^2 ]^-1
-    if (!mD2Chi2Dz2.Invert()) {
-      return false;
-    }
-    VecND dz = mD2Chi2Dz2 * mDChi2Dz;
-
-    if (!FwdcorrectTracks(dz)) {
-      return false;
-    }
-    FwdcalcPCANoErr(); // updated PCA
-    if (mCrossIDAlt >= 0 && closerToAlternative()) {
-      mAllowAltPreference = false;
-      return false;
-    }
-    FwdcalcTrackResiduals();      // updated residuals
-    chi2Upd = FwdcalcChi2NoErr(); // updated chi2
-    if (getAbsMax(dz) < mMinParamChange || chi2Upd > chi2 * mMinRelChi2Change) {
-      chi2 = chi2Upd;
-      break; // converged
-    }
-    chi2 = chi2Upd;
-  } while (++mNIters[mCurHyp] < mMaxIter);
-  //
-  mChi2[mCurHyp] = chi2 * NInv;
-  return mChi2[mCurHyp] < mMaxChi2;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::roughDXCut() const
-{
-  // apply rough cut on DX between the tracks in the seed point
-
-  bool accept = true;
-  for (int i = N; accept && i--;) {
-    for (int j = i; j--;) {
-      if (std::abs(mCandTr[mCurHyp][i].getX() - mCandTr[mCurHyp][j].getX()) > mMaxDXIni) {
-        accept = false;
-        break;
-      }
-    }
-  }
-  return accept;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-bool FwdDCAFitterN<N, Args...>::closerToAlternative() const
-{
-  // check if the point current PCA point is closer to the seeding XY point being tested or to alternative see (if any)
-  auto dxCur = mPCA[mCurHyp][0] - mCrossings.xDCA[mCrossIDCur], dyCur = mPCA[mCurHyp][1] - mCrossings.yDCA[mCrossIDCur];
-  auto dxAlt = mPCA[mCurHyp][0] - mCrossings.xDCA[mCrossIDAlt], dyAlt = mPCA[mCurHyp][1] - mCrossings.yDCA[mCrossIDAlt];
-  return dxCur * dxCur + dyCur * dyCur > dxAlt * dxAlt + dyAlt * dyAlt;
-}
-
-//___________________________________________________________________
-template <int N, typename... Args>
-void FwdDCAFitterN<N, Args...>::print() const
-{
-  LOG(info) << N << "-prong vertex fitter in " << (mUseAbsDCA ? "abs." : "weighted") << " distance minimization mode";
-  LOG(info) << "Bz: " << mBz << " MaxIter: " << mMaxIter << " MaxChi2: " << mMaxChi2;
-  LOG(info) << "Stopping condition: Max.param change < " << mMinParamChange << " Rel.Chi2 change > " << mMinRelChi2Change;
-  LOG(info) << "Discard candidates for : Rvtx > " << getMaxR() << " DZ between tracks > " << mMaxDXIni;
-}
-//___________________________________________________________________
-template <int N, typename... Args>
-inline bool FwdDCAFitterN<N, Args...>::propagateToVtx(o2::track::TrackParCovFwd& t, const std::array<float, 3>& p, const std::array<float, 2>& cov) const
-{
-  // propagate track to vertex including MCS effects if material budget included, simple propagation to Z otherwise
-  float x2x0 = 0;
-  if (mUseMatBudget) {
-    auto mb = mMatLUT->getMatBudget(t.getX(), t.getY(), t.getZ(), p[0], p[1], p[2]);
-    x2x0 = (float)mb.meanX2X0;
-    return t.propagateToVtxhelixWithMCS(p[2], {p[0], p[1]}, cov, mBz, x2x0);
-  } else if (mTGeoFallBackAllowed) {
-    auto geoMan = o2::base::GeometryManager::meanMaterialBudget(t.getX(), t.getY(), t.getZ(), p[0], p[1], p[2]);
-    x2x0 = (float)geoMan.meanX2X0;
-    return t.propagateToVtxhelixWithMCS(p[2], {p[0], p[1]}, cov, mBz, x2x0);
-  } else {
-    t.propagateToZhelix(p[2], mBz);
-    return true;
-  }
-}
-
-using FwdDCAFitter2 = FwdDCAFitterN<2, o2::track::TrackParCovFwd>;
-using FwdDCAFitter3 = FwdDCAFitterN<3, o2::track::TrackParCovFwd>;
-
-} // namespace vertexing
-} // namespace o2
-#endif // _ALICEO2_DCA_FWDFITTERN_
diff --git a/Detectors/Vertexing/src/FwdDCAFitterN.cxx b/Detectors/Vertexing/src/FwdDCAFitterN.cxx
deleted file mode 100644
index f7176aa5039fd..0000000000000
--- a/Detectors/Vertexing/src/FwdDCAFitterN.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file DCAFitterN.cxx
-/// \brief Defintions for N-prongs secondary vertex fit
-/// \author ruben.shahoyan@cern.ch, adapted from central barrel to fwd rapidities by Rita Sadek, rita.sadek@cern.ch
-
-#include "DetectorsVertexing/FwdDCAFitterN.h"
-
-namespace o2
-{
-namespace vertexing
-{
-
-void __test_instance__()
-{
-  FwdDCAFitter2 ft2;
-  FwdDCAFitter3 ft3;
-  o2::track::TrackParCovFwd tr;
-  ft2.process(tr, tr);
-  ft3.process(tr, tr, tr);
-}
-
-} // namespace vertexing
-} // namespace o2
diff --git a/Detectors/ZDC/calib/testWorkflow/DataGeneratorSpec.h b/Detectors/ZDC/calib/testWorkflow/DataGeneratorSpec.h
deleted file mode 100644
index 22761869f6ff2..0000000000000
--- a/Detectors/ZDC/calib/testWorkflow/DataGeneratorSpec.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef O2_CALIBRATION_DATAGENERATOR_H
-#define O2_CALIBRATION_DATAGENERATOR_H
-
-/// @file   DataGeneratorSpec.h
-/// @brief  Dummy data generator
-
-#include <unistd.h>
-#include <TRandom.h>
-#include "Framework/DeviceSpec.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/ControlService.h"
-#include "Framework/WorkflowSpec.h"
-#include "Framework/Task.h"
-#include "Framework/Logger.h"
-#include "DataFormatsZDC/CalibInfoZDC.h"
-#include "ZDCBase/Constants.h"
-#include "CommonConstants/MathConstants.h"
-
-namespace o2
-{
-namespace calibration
-{
-
-class TFDispatcher : public o2::framework::Task
-{
- public:
-  TFDispatcher(int slot, int ngen, int nlanes, int latency) : mSlot(slot), mNGen(ngen), mNLanes(nlanes), mLatency(latency) {}
-
-  void init(o2::framework::InitContext& ic) final
-  {
-    mMaxTF = ic.options().get<int64_t>("max-timeframes");
-  }
-
-  void run(o2::framework::ProcessingContext& pc) final
-  {
-    for (auto& input : pc.inputs()) {
-      auto tfid = header::get<o2::framework::DataProcessingHeader*>(input.header)->startTime;
-      if (tfid >= mMaxTF - 1) {
-        LOG(info) << "Data generator reached TF " << tfid << ", stopping";
-        pc.services().get<o2::framework::ControlService>().endOfStream();
-        pc.services().get<o2::framework::ControlService>().readyToQuit(o2::framework::QuitRequest::Me);
-        if (!acceptTF(tfid)) {
-          return;
-        }
-        break;
-      }
-      if (!acceptTF(tfid)) {
-        return;
-      }
-    }
-    int size = 100 + gRandom->Integer(100); // push dummy output
-    usleep(mLatency);
-    pc.outputs().snapshot(o2::framework::OutputRef{"output", 0}, size);
-  }
-
-  bool acceptTF(int tfid)
-  {
-
-    // check if the current TF should be processed by this instance of the generator
-
-    int targetSlot = (tfid / mNLanes) % mNGen;
-    if (targetSlot != mSlot) {
-      LOG(info) << "tfid = " << tfid << ", mNLanes = " << mNLanes << ", mNGen = " << mNGen << ", mSlot = " << mSlot << " target slot = " << targetSlot << ": discarded";
-      return false;
-    }
-    LOG(info) << "tfid = " << tfid << ", mNLanes = " << mNLanes << ", mNGen = " << mNGen << ", mSlot = " << mSlot << " target slot = " << targetSlot << ": accepted";
-    return true;
-  }
-
- private:
-  uint64_t mMaxTF = 1;
-  int mSlot = 1;
-  int mNGen = 1;
-  int mNLanes = 1;
-  int mLatency = 0;
-};
-
-class TFProcessor : public o2::framework::Task
-{
- public:
-  TFProcessor(int latency, int latencyRMS) : mMeanLatency(latency), mLatencyRMS(latencyRMS){};
-
-  void init(o2::framework::InitContext& ic) final
-  {
-    mDevCopy = ic.services().get<const o2::framework::DeviceSpec>().inputTimesliceId;
-    gRandom->SetSeed(mDevCopy);
-    mZDCChannelCalib = ic.options().get<bool>("do-ZDC-channel-calib");
-    mZDCChannelCalibInTestMode = ic.options().get<bool>("do-ZDC-channel-calib-in-test-mode");
-    LOG(info) << "TFProcessorCopy: " << mDevCopy << " MeanLatency: " << mMeanLatency << " LatencyRMS: " << mLatencyRMS << " DoZDCChannelCalib: " << mZDCChannelCalib
-              << " DoZDCChannelCalibInTestMode: " << mZDCChannelCalibInTestMode;
-  }
-
-  void run(o2::framework::ProcessingContext& pc) final
-  {
-    auto tfcounter = o2::header::get<o2::framework::DataProcessingHeader*>(pc.inputs().get("input").header)->startTime;
-    // introduceDelay
-    uint32_t delay = std::abs(gRandom->Gaus(mMeanLatency, mLatencyRMS));
-    LOG(info) << "TFProcessorCopy: " << mDevCopy << " Simulate latency of " << delay << " mcs for TF " << tfcounter;
-    usleep(delay);
-
-    // push dummy output
-    auto size = pc.inputs().get<int>("input");
-    auto& output = pc.outputs().make<std::vector<o2::dataformats::CalibInfoZDC>>(o2::framework::OutputRef{"output", 0});
-    output.reserve(size);
-
-    for (int i = size; i--;) {
-      if (!mZDCChannelCalib) {
-        output.emplace_back(gRandom->Integer(32), 0, gRandom->Gaus(clockShift, 100.), 0, 0);
-      } else {
-        int channel = mZDCChannelCalibInTestMode ? gRandom->Integer(100) : gRandom->Integer(32);
-        double tot = gRandom->Gaus(12, 2); // in ns
-        output.emplace_back(channel, 0, value, tot, 0);
-      }
-    }
-  }
-
- private:
-  int mDevCopy = 0;
-  uint32_t mMeanLatency = 0;
-  uint32_t mLatencyRMS = 1;
-  bool mZDCChannelCalib = false;
-  bool mZDCChannelCalibInTestMode = false;
-};
-
-} // namespace calibration
-
-namespace framework
-{
-
-DataProcessorSpec getTFDispatcherSpec(int slot, int ngen, int nlanes, int latency)
-{
-  return DataProcessorSpec{
-    "calib-tf-dispatcher",
-    Inputs{},
-    Outputs{{{"output"}, "ZDC", "DATASIZE"}},
-    AlgorithmSpec{adaptFromTask<o2::calibration::TFDispatcher>(slot, ngen, nlanes, latency)},
-    Options{{"max-timeframes", VariantType::Int64, 99999999999ll, {"max TimeFrames to generate"}}}};
-}
-
-DataProcessorSpec getTFProcessorSpec(int latency, int latencyRMS)
-{
-  return DataProcessorSpec{
-    "calib-tf-data-processor",
-    Inputs{{"input", "ZDC", "DATASIZE"}},
-    Outputs{{{"output"}, "ZDC", "CALIBDATA"}},
-    AlgorithmSpec{adaptFromTask<o2::calibration::TFProcessor>(latency, latencyRMS)},
-    Options{
-      {"do-ZDC-channel-calib", VariantType::Bool, false, {"flag to do ZDC ChannelCalib"}},
-      {"do-ZDC-channel-calib-in-test-mode", VariantType::Bool, false, {"flag to do ZDC ChannelCalib in testMode"}}}};
-}
-
-} // namespace framework
-} // namespace o2
-
-#endif
diff --git a/Detectors/ZDC/calib/testWorkflow/data-generator-workflow.cxx b/Detectors/ZDC/calib/testWorkflow/data-generator-workflow.cxx
deleted file mode 100644
index ccafbb704ed9f..0000000000000
--- a/Detectors/ZDC/calib/testWorkflow/data-generator-workflow.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "Framework/DataProcessorSpec.h"
-#include "DataGeneratorSpec.h"
-
-using namespace o2::framework;
-
-// we need to add workflow options before including Framework/runDataProcessing
-void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
-{
-  // option allowing to set parameters
-  workflowOptions.push_back(ConfigParamSpec{"lanes", o2::framework::VariantType::Int, 2, {"number of data generator lanes"}});
-  workflowOptions.push_back(ConfigParamSpec{"gen-norm", o2::framework::VariantType::Int, 1, {"nominal number of expected generators"}});
-  workflowOptions.push_back(ConfigParamSpec{"gen-slot", o2::framework::VariantType::Int, 0, {"generate TFs of slot in [0 : gen-norm) range"}});
-  workflowOptions.push_back(ConfigParamSpec{"pressure", o2::framework::VariantType::Float, 1.f, {"generation / processing rate factor"}});
-  workflowOptions.push_back(ConfigParamSpec{"mean-latency", o2::framework::VariantType::Int, 1000, {"mean latency of the processor in microseconds"}});
-  workflowOptions.push_back(ConfigParamSpec{"latency-spread", o2::framework::VariantType::Int, 100, {"latency gaussian RMS of the processor in microseconds"}});
-}
-
-// ------------------------------------------------------------------
-
-#include "Framework/runDataProcessing.h"
-
-WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
-{
-  WorkflowSpec specs;
-  auto nlanes = std::max(1, configcontext.options().get<int>("lanes"));
-  auto ngen = std::max(1, configcontext.options().get<int>("gen-norm"));
-  auto slot = std::max(0, configcontext.options().get<int>("gen-slot"));
-  auto latency = std::max(1, configcontext.options().get<int>("mean-latency"));
-  auto latencyRMS = std::max(1, configcontext.options().get<int>("latency-spread"));
-  auto pressure = std::max(0.001f, configcontext.options().get<float>("pressure"));
-  if (slot >= ngen) {
-    slot = 0;
-    ngen = 1;
-  }
-  specs.emplace_back(getTFDispatcherSpec(slot, ngen, nlanes, std::max(1, int(float(latency) / nlanes / pressure))));
-  specs.emplace_back(timePipeline(getTFProcessorSpec(latency, latencyRMS), nlanes));
-  return specs;
-}
diff --git a/Detectors/ZDC/calib/testWorkflow/zdc-calib-workflow.cxx b/Detectors/ZDC/calib/testWorkflow/zdc-calib-workflow.cxx
deleted file mode 100644
index 73fe5a09eb663..0000000000000
--- a/Detectors/ZDC/calib/testWorkflow/zdc-calib-workflow.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "Framework/DataProcessorSpec.h"
-
-using namespace o2::framework;
-
-// we need to add workflow options before including Framework/runDataProcessing
-void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
-{
-  // option allowing to set parameters
-  workflowOptions.push_back(ConfigParamSpec{"use-ccdb", o2::framework::VariantType::Bool, false, {"enable access to ccdb ZDC calibration objects"}});
-  workflowOptions.push_back(ConfigParamSpec{"do-lhc-phase", o2::framework::VariantType::Bool, true, {"do LHC clock phase calibration"}});
-}
-
-// ------------------------------------------------------------------
-
-#include "Framework/runDataProcessing.h"
-
-WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
-{
-  WorkflowSpec specs;
-  auto useCCDB = configcontext.options().get<bool>("use-ccdb");
-  auto doLHCcalib = configcontext.options().get<bool>("do-lhc-phase");
-
-  LOG(info) << "ZDC Calibration workflow: options";
-  LOG(info) << "useCCDB = " << useCCDB;
-  return specs;
-}
diff --git a/Framework/Core/include/Framework/DataProcessingStateManager.h b/Framework/Core/include/Framework/DataProcessingStateManager.h
deleted file mode 100644
index eaa1c8e4e5501..0000000000000
--- a/Framework/Core/include/Framework/DataProcessingStateManager.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef O2_DATAPROCESSINGSTATEMANAGER_H_
-#define O2_DATAPROCESSINGSTATEMANAGER_H_
-
-#include <array>
-#include <vector>
-#include <string>
-
-struct DataProcessingStateManager {
-  struct StateIndex {
-    short id = -1;
-    short index = -1;
-  };
-  struct StateInfo {
-    std::string name;
-    int64_t lastUpdate = 0;
-    int index = -1;
-  };
-
-  static constexpr int MAX_STATES = 1024;
-  std::vector<std::array<char, 1024>> states = {};
-  std::vector<StateInfo> infos = {};
-};
-
-#endif
diff --git a/Framework/Foundation/include/Framework/Features.h b/Framework/Foundation/include/Framework/Features.h
deleted file mode 100644
index 0331324dd810d..0000000000000
--- a/Framework/Foundation/include/Framework/Features.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef O2_FRAMEWORK_FEATURES_H_
-#define O2_FRAMEWORK_FEATURES_H_
-
-#define DPL_HAS_SERVICEREGISTRY_REF 1
-
-#endif
diff --git a/Framework/Foundation/src/Traits.cxx b/Framework/Foundation/src/Traits.cxx
deleted file mode 100644
index faff430964e73..0000000000000
--- a/Framework/Foundation/src/Traits.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
diff --git a/Framework/TestWorkflows/src/dummy.cxx b/Framework/TestWorkflows/src/dummy.cxx
deleted file mode 100644
index faff430964e73..0000000000000
--- a/Framework/TestWorkflows/src/dummy.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
diff --git a/Framework/TestWorkflows/src/o2_sim_its_ALP3.h b/Framework/TestWorkflows/src/o2_sim_its_ALP3.h
deleted file mode 100644
index f9c465fcf5717..0000000000000
--- a/Framework/TestWorkflows/src/o2_sim_its_ALP3.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef WORKFLOWS_O2_SIM_ITS_ALP3
-#define WORKFLOWS_O2_SIM_ITS_ALP3
-
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace workflows
-{
-o2::framework::DataProcessorSpec sim_its_ALP3();
-}
-} // namespace o2
-
-#endif // WORKFLOWS_O2_SIM_ITS_ALP3
diff --git a/Framework/TestWorkflows/src/o2_sim_tpc.cxx b/Framework/TestWorkflows/src/o2_sim_tpc.cxx
deleted file mode 100644
index 4587c0fcb831f..0000000000000
--- a/Framework/TestWorkflows/src/o2_sim_tpc.cxx
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-#include "Framework/DataRefUtils.h"
-#include "Framework/WorkflowSpec.h"
-#include <Monitoring/Monitoring.h>
-#include "Framework/RootFileService.h"
-#include "Framework/AlgorithmSpec.h"
-#include "Framework/ConfigParamRegistry.h"
-
-#include "Framework/Logger.h"
-
-#include "FairRunSim.h"
-#include <FairRootFileSink.h>
-#include "FairRuntimeDb.h"
-#include "FairPrimaryGenerator.h"
-#include "FairBoxGenerator.h"
-#include "FairParRootFileIo.h"
-
-#include "DetectorsPassive/Cave.h"
-#include "Field/MagneticField.h"
-
-#include "DetectorsPassive/Cave.h"
-#include "Generators/GeneratorFromFile.h"
-#include "TPCSimulation/Detector.h"
-#include "Framework/OutputSpec.h"
-#include <vector>
-
-using namespace o2::framework;
-
-#define BOX_GENERATOR 1
-
-namespace o2
-{
-namespace workflows
-{
-
-DataProcessorSpec sim_tpc()
-{
-  return {
-    "sim_tpc",
-    Inputs{},
-    Outputs{OutputSpec{"TPC", "GEN"}},
-    AlgorithmSpec{
-      [](InitContext& setup) {
-        int nEvents = setup.options().get<int>("nEvents");
-        auto mcEngine = setup.options().get<std::string>("mcEngine");
-
-        // FIXME: this should probably be part of some generic
-        //        FairRunInitSpec
-        TString dir = getenv("VMCWORKDIR");
-        TString geom_dir = dir + "/Detectors/Geometry/";
-        gSystem->Setenv("GEOMPATH", geom_dir.Data());
-
-        TString tut_configdir = dir + "/Detectors/gconfig";
-        gSystem->Setenv("CONFIG_DIR", tut_configdir.Data());
-
-        // Requiring a file is something which requires IO, and it's therefore
-        // delegated to the framework
-        auto& rfm = setup.services().get<RootFileService>();
-        // FIXME: We should propably have a service for FairRunSim, rather than
-        //        for the root files themselves...
-        // Output file name
-        auto outFile = rfm.format("AliceO2_%s.tpc.mc_%i_event.root", mcEngine.c_str(), nEvents);
-
-        // Parameter file name
-        auto parFile = rfm.format("AliceO2_%s.tpc.mc_%i_event.root", mcEngine.c_str(), nEvents);
-
-        // Create simulation run
-        FairRunSim* run = new FairRunSim();
-
-        run->SetName(mcEngine.c_str());
-        run->SetSink(new FairRootFileSink(outFile.c_str())); // Output file
-        FairRuntimeDb* rtdb = run->GetRuntimeDb();
-
-        // Create media
-        run->SetMaterials("media.geo"); // Materials
-
-        // Create geometry
-        o2::passive::Cave* cave = new o2::passive::Cave("CAVE");
-        cave->SetGeometryFileName("cave.geo");
-        run->AddModule(cave);
-
-        o2::field::MagneticField* magField = new o2::field::MagneticField("Maps", "Maps", -1., -1., o2::field::MagFieldParam::k5kG);
-        run->SetField(magField);
-
-        // ===| Add TPC |============================================================
-        o2::tpc::Detector* tpc = new o2::tpc::Detector(kTRUE);
-        tpc->SetGeoFileName("TPCGeometry.root");
-        run->AddModule(tpc);
-
-        // Create PrimaryGenerator
-        FairPrimaryGenerator* primGen = new FairPrimaryGenerator();
-#ifdef BOX_GENERATOR
-        FairBoxGenerator* boxGen = new FairBoxGenerator(211, 10); /*protons*/
-
-        //boxGen->SetThetaRange(0.0, 90.0);
-        boxGen->SetEtaRange(-0.9, 0.9);
-        boxGen->SetPRange(0.1, 5);
-        boxGen->SetPhiRange(0., 360.);
-        boxGen->SetDebug(kTRUE);
-
-        primGen->AddGenerator(boxGen);
-#else
-        // reading the events from a kinematics file (produced by AliRoot)
-        auto extGen = new o2::eventgen::GeneratorFromFile(params.get<std::string>("extKinFile"));
-        extGen->SetStartEvent(params.get<int>("startEvent"));
-        primGen->AddGenerator(extGen);
-#endif
-
-        run->SetGenerator(primGen);
-
-        // store track trajectories
-        // run->SetStoreTraj(kTRUE);
-
-        // Initialize simulation run
-        run->Init();
-
-        // Runtime database
-        Bool_t kParameterMerged = kTRUE;
-        FairParRootFileIo* parOut = new FairParRootFileIo(kParameterMerged);
-        parOut->open(parFile.c_str());
-        rtdb->setOutput(parOut);
-        rtdb->saveOutput();
-        rtdb->print();
-        run->Run(nEvents);
-
-        static bool once = true;
-
-        // This is the actual inner loop for the device
-        return [run, nEvents](ProcessingContext& ctx) {
-          if (!once) {
-            run->Run(nEvents);
-            once = true;
-          } else {
-            std::this_thread::sleep_for(std::chrono::seconds(1));
-          }
-          // FIXME: After we run we should readback events
-          // and push them as messages, for the next stage of
-          // processing.
-        };
-      }},
-    Options{
-      {"mcEngine", VariantType::String, "TGeant3", {"Engine to use"}},
-      {"nEvents", VariantType::Int, 10, {"Events to process"}},
-      {"extKinFile", VariantType::String, "Kinematics.root", {"name of kinematics file for event generator from file (when applicable)"}},
-      {"startEvent", VariantType::Int, 2, {"Events to skip"}}}};
-};
-} // namespace workflows
-} // namespace o2
diff --git a/Framework/TestWorkflows/src/o2_sim_tpc.h b/Framework/TestWorkflows/src/o2_sim_tpc.h
deleted file mode 100644
index e567fe89e0b38..0000000000000
--- a/Framework/TestWorkflows/src/o2_sim_tpc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#ifndef WORKFLOWS_O2_SIM_TPC
-#define WORKFLOWS_O2_SIM_TPC
-
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace workflows
-{
-o2::framework::DataProcessorSpec sim_tpc();
-}
-} // namespace o2
-
-#endif // WORKFLOWS_O2_SIM_TPC
diff --git a/Framework/TestWorkflows/src/test_o2ITSCluserizer.cxx b/Framework/TestWorkflows/src/test_o2ITSCluserizer.cxx
deleted file mode 100644
index d6d3cb1242f7c..0000000000000
--- a/Framework/TestWorkflows/src/test_o2ITSCluserizer.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-#include "Framework/DataRefUtils.h"
-#include "Framework/ServiceRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include <Monitoring/Monitoring.h>
-// FIXME: this should not be needed as the framework should be able to
-//        decode TClonesArray by itself.
-#include "Framework/TMessageSerializer.h"
-#include "o2_sim_its_ALP3.h"
-#include "Framework/Logger.h"
-#include <TClonesArray.h>
-#include <TH1F.h>
-
-using namespace o2::framework;
-using namespace o2::workflows;
-
-// This is how you can define your processing in a declarative way
-WorkflowSpec defineDataProcessing(ConfigContext const&)
-{
-  return WorkflowSpec{
-    sim_its_ALP3(),
-  };
-}
diff --git a/Framework/TestWorkflows/src/test_o2TPCSimulation.cxx b/Framework/TestWorkflows/src/test_o2TPCSimulation.cxx
deleted file mode 100644
index 403ad8bc7127b..0000000000000
--- a/Framework/TestWorkflows/src/test_o2TPCSimulation.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-#include "Framework/DataRefUtils.h"
-#include "Framework/ServiceRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/DataRef.h"
-// FIXME: this should not be needed as the framework should be able to
-//        decode TClonesArray by itself.
-#include "Framework/TMessageSerializer.h"
-#include "o2_sim_tpc.h"
-#include "Framework/Logger.h"
-
-using namespace o2::framework;
-using namespace o2::workflows;
-
-// This is how you can define your processing in a declarative way
-WorkflowSpec defineDataProcessing(ConfigContext const& specs)
-{
-  return WorkflowSpec{
-    sim_tpc(),
-  };
-}
diff --git a/Framework/Utils/test/DPLBroadcasterMerger.cxx b/Framework/Utils/test/DPLBroadcasterMerger.cxx
deleted file mode 100644
index bf793275d2f3f..0000000000000
--- a/Framework/Utils/test/DPLBroadcasterMerger.cxx
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \author Gabriele Gaetano Fronzé, gfronze@cern.ch
-
-#include <fstream>
-#include "DPLBroadcasterMerger.h"
-#include "DPLUtils/Utils.h"
-#include "Framework/DataProcessorSpec.h"
-#include "Framework/ControlService.h"
-#include "Framework/DataRefUtils.h"
-#include "random"
-#include "Framework/Logger.h"
-#include <thread>
-
-namespace o2f = o2::framework;
-
-namespace o2::workflows
-{
-
-o2f::Inputs noInputs{};
-o2f::Outputs noOutputs{};
-
-o2f::DataProcessorSpec defineGenerator(o2f::OutputSpec usrOutput)
-{
-  return {"Generator",             // Device name
-          noInputs,                // No inputs for a generator
-          o2f::Outputs{usrOutput}, // One simple output
-
-          o2f::AlgorithmSpec{[usrOutput](o2f::InitContext&) {
-            int msgCounter = 0;
-            auto msgCounter_shptr = std::make_shared<int>(msgCounter);
-            auto usrOutput_shptr = std::make_shared<o2f::Output>(getOutput(usrOutput));
-
-            LOG(info) << ">>>>>>>>>>>>>> Generator initialised";
-
-            // Processing context in captured from return on InitCallback
-            return [usrOutput_shptr, msgCounter_shptr](o2f::ProcessingContext& ctx) {
-              int msgIndex = (*msgCounter_shptr)++;
-              if (msgIndex > 10) {
-                ctx.services().get<framework::ControlService>().endOfStream();
-              }
-              LOG(info) << ">>> MSG:" << msgIndex;
-              std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-
-              LOG(info) << ">>> Preparing MSG:" << msgIndex;
-
-              auto& outputMsg =
-                ctx.outputs().newChunk(*usrOutput_shptr, (msgIndex + 1) * sizeof(uint32_t) / sizeof(char));
-
-              LOG(info) << ">>> Preparing1 MSG:" << msgIndex;
-
-              auto payload = reinterpret_cast<uint32_t*>(outputMsg.data());
-
-              payload[0] = msgIndex;
-
-              LOG(info) << ">>> Preparing2 MSG:" << msgIndex;
-
-              for (int k = 0; k < msgIndex; ++k) {
-                payload[k + 1] = (uint32_t)32;
-                LOG(info) << ">>>>\t" << payload[k + 1];
-              }
-
-              return;
-            };
-          }}};
-}
-
-o2f::DataProcessorSpec definePipeline(std::string devName, o2f::InputSpec usrInput, o2f::OutputSpec usrOutput)
-{
-  return {devName,               // Device name
-          o2f::Inputs{usrInput}, // No inputs, for the moment
-          o2f::Outputs{usrOutput}, o2f::AlgorithmSpec{[usrOutput](o2f::InitContext&) {
-            auto output_sharedptr = std::make_shared<o2f::Output>(getOutput(usrOutput));
-
-            // Processing context in captured from return on InitCallback
-            return [output_sharedptr](o2f::ProcessingContext& ctx) {
-              auto inputMsg = ctx.inputs().getByPos(0);
-              auto msgSize = o2::framework::DataRefUtils::getPayloadSize(inputMsg);
-
-              auto& fwdMsg = ctx.outputs().newChunk((*output_sharedptr), msgSize);
-              std::memcpy(fwdMsg.data(), inputMsg.payload, msgSize);
-            };
-          }}};
-}
-
-o2f::DataProcessorSpec defineSink(o2f::InputSpec usrInput)
-{
-  return {"Sink",                // Device name
-          o2f::Inputs{usrInput}, // No inputs, for the moment
-          noOutputs,
-
-          o2f::AlgorithmSpec{[](o2f::InitContext&) {
-            // Processing context in captured from return on InitCallback
-            return [](o2f::ProcessingContext& ctx) {
-              LOG(info) << "Received message ";
-
-              auto inputMsg = ctx.inputs().getByPos(0);
-              auto payload = reinterpret_cast<const uint32_t*>(inputMsg.payload);
-
-              LOG(info) << "Received message containing" << payload[0] << "elements";
-
-              for (int j = 0; j < payload[0]; ++j) {
-                LOG(info) << payload[j + 1] << "\t";
-              }
-              LOG(info);
-            };
-          }}};
-}
-
-o2::framework::WorkflowSpec DPLBroadcasterMergerWorkflow()
-{
-  auto lspec = o2f::WorkflowSpec();
-
-  // A generator of data
-  lspec.emplace_back(defineGenerator(o2f::OutputSpec{"TST", "ToBC", 0, o2f::Lifetime::Timeframe}));
-
-  // A two-way broadcaster
-  lspec.emplace_back(defineBroadcaster("Broadcaster",
-                                       o2f::InputSpec{"input", "TST", "ToBC", 0, o2f::Lifetime::Timeframe},
-                                       o2f::Outputs{{"TST", "BCAST0", 0, o2f::Lifetime::Timeframe},
-                                                    {"TST", "BCAST1", 0, o2f::Lifetime::Timeframe}}));
-
-  // Two pipeline devices
-  lspec.emplace_back(definePipeline("pip0", o2f::InputSpec{"bc", "TST", "BCAST0", 0, o2f::Lifetime::Timeframe},
-                                    o2f::OutputSpec{"TST", "PIP0", 0, o2f::Lifetime::Timeframe}));
-  lspec.emplace_back(definePipeline("pip1", o2f::InputSpec{"bc", "TST", "BCAST1", 0, o2f::Lifetime::Timeframe},
-                                    o2f::OutputSpec{"TST", "PIP1", 0, o2f::Lifetime::Timeframe}));
-
-  // A gatherer
-  lspec.emplace_back(defineMerger("Merger", o2f::Inputs{{"input1", "TST", "PIP0", 0, o2f::Lifetime::Timeframe}, {"input2", "TST", "PIP1", 0, o2f::Lifetime::Timeframe}},
-                                  o2f::OutputSpec{"TST", "ToSink", 0, o2f::Lifetime::Timeframe}));
-
-  // A sink which dumps messages
-  lspec.emplace_back(defineSink(o2f::InputSpec{"input", "TST", "ToSink", 0, o2f::Lifetime::Timeframe}));
-  return std::move(lspec);
-}
-
-} // namespace o2::workflows
diff --git a/Framework/Utils/test/DPLBroadcasterMerger.h b/Framework/Utils/test/DPLBroadcasterMerger.h
deleted file mode 100644
index 4607d72a702b7..0000000000000
--- a/Framework/Utils/test/DPLBroadcasterMerger.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \author Gabriele Gaetano Fronzé, gfronze@cern.ch
-
-#ifndef DPLBROADCASTERMERGER_H
-#define DPLBROADCASTERMERGER_H
-
-#include "Framework/WorkflowSpec.h"
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace workflows
-{
-o2::framework::WorkflowSpec DPLBroadcasterMergerWorkflow();
-}
-} // namespace o2
-
-#endif // DPLBROADCASTERMERGER_H
diff --git a/Framework/Utils/test/DPLOutputTest.h b/Framework/Utils/test/DPLOutputTest.h
deleted file mode 100644
index ce776ffff1113..0000000000000
--- a/Framework/Utils/test/DPLOutputTest.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \author Gabriele Gaetano Fronzé, gfronze@cern.ch
-
-#ifndef DPLOUTPUTTEST_H
-#define DPLOUTPUTTEST_H
-
-#include "Framework/WorkflowSpec.h"
-#include "Framework/DataProcessorSpec.h"
-
-namespace o2
-{
-namespace workflows
-{
-o2::framework::WorkflowSpec DPLOutputTest();
-}
-} // namespace o2
-
-#endif // DPLOUTPUTTEST_H
diff --git a/Framework/Utils/test/test_DPLBroadcasterMerger.cxx b/Framework/Utils/test/test_DPLBroadcasterMerger.cxx
deleted file mode 100644
index 6ff554e75f462..0000000000000
--- a/Framework/Utils/test/test_DPLBroadcasterMerger.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \author Gabriele Gaetano Fronzé, gfronze@cern.ch
-
-#include "Framework/DataRefUtils.h"
-#include "Framework/ServiceRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/DataRef.h"
-// FIXME: this should not be needed as the framework should be able to
-//        decode TClonesArray by itself.
-#include "Framework/TMessageSerializer.h"
-#include "DPLBroadcasterMerger.h"
-#include "Framework/Logger.h"
-
-using namespace o2::framework;
-
-// This is how you can define your processing in a declarative way
-WorkflowSpec defineDataProcessing(ConfigContext const&)
-{
-  return o2::workflows::DPLBroadcasterMergerWorkflow();
-}
diff --git a/Framework/Utils/test/test_DPLOutputTest.cxx b/Framework/Utils/test/test_DPLOutputTest.cxx
deleted file mode 100644
index e49bea3074dd1..0000000000000
--- a/Framework/Utils/test/test_DPLOutputTest.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \author Gabriele Gaetano Fronzé, gfronze@cern.ch
-
-#include "Framework/DataRefUtils.h"
-#include "Framework/ServiceRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/ConfigParamRegistry.h"
-#include "Framework/DataRef.h"
-// FIXME: this should not be needed as the framework should be able to
-//        decode TClonesArray by itself.
-#include "Framework/TMessageSerializer.h"
-#include "DPLOutputTest.h"
-#include "Framework/Logger.h"
-
-using namespace o2::framework;
-
-// This is how you can define your processing in a declarative way
-WorkflowSpec defineDataProcessing(ConfigContext const&)
-{
-  return o2::workflows::DPLOutputTest();
-}
diff --git a/GPU/GPUTracking/Base/hip/test/testGPUsortHIP.hip.cxx b/GPU/GPUTracking/Base/hip/test/testGPUsortHIP.hip.cxx
deleted file mode 100644
index ed13124ef65df..0000000000000
--- a/GPU/GPUTracking/Base/hip/test/testGPUsortHIP.hip.cxx
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file testGPUsortHIP.hip
-/// \author Michael Lettrich
-
-#define GPUCA_GPUTYPE_VEGA
-
-#define BOOST_TEST_MODULE Test GPUCommonAlgorithm Sorting HIP
-#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
-
-#include <iostream>
-#include <cstring>
-#include <hip/hip_runtime.h>
-#include <boost/test/unit_test.hpp>
-#include "GPUCommonAlgorithm.h"
-
-///////////////////////////////////////////////////////////////
-// Test setup and tear down
-///////////////////////////////////////////////////////////////
-
-static constexpr float TOLERANCE = 10 * std::numeric_limits<float>::epsilon();
-
-hipError_t hipCheckError(hipError_t hipErrorCode)
-{
-  if (hipErrorCode != hipSuccess) {
-    std::cerr << "ErrorCode " << hipErrorCode << " " << hipGetErrorName(hipErrorCode) << ": " << hipGetErrorString(hipErrorCode) << std::endl;
-  }
-  return hipErrorCode;
-}
-
-void hipCheckErrorFatal(hipError_t hipErrorCode)
-{
-  if (hipCheckError(hipErrorCode) != hipSuccess) {
-    exit(-1);
-  }
-}
-
-struct TestEnvironment {
-  TestEnvironment() : size(101), data(nullptr), sorted(size)
-  {
-    hipCheckErrorFatal(hipHostMalloc(&data, size * sizeof(float), hipHostRegisterDefault));
-
-    // create an array of unordered floats with negative and positive values
-    for (size_t i = 0; i < size; i++) {
-      data[i] = size / 2.0f - i;
-    }
-    // create copy
-    std::memcpy(sorted.data(), data, size * sizeof(float));
-    // sort
-    std::sort(sorted.begin(), sorted.end());
-  }
-
-  ~TestEnvironment() // NOLINT: clang-tidy doesn't understand hip macro magic, and thinks this is trivial
-  {
-    hipCheckErrorFatal(hipFree(data));
-  };
-
-  const size_t size;
-  float* data;
-  std::vector<float> sorted;
-};
-
-template <typename T>
-void testAlmostEqualArray(T* correct, T* testing, size_t size)
-{
-  for (size_t i = 0; i < size; i++) {
-    if (std::fabs(correct[i]) < TOLERANCE) {
-      BOOST_CHECK_SMALL(testing[i], TOLERANCE);
-    } else {
-      BOOST_CHECK_CLOSE(correct[i], testing[i], TOLERANCE);
-    }
-  }
-}
-
-///////////////////////////////////////////////////////////////
-
-__global__ void sortInThread(float* data, size_t dataLength)
-{
-  // make sure only one thread is working on this.
-  if (hipBlockIdx_x == 0 && hipBlockIdx_y == 0 && hipBlockIdx_z == 0 && hipThreadIdx_x == 0 && hipThreadIdx_y == 0 && hipThreadIdx_z == 0) {
-    o2::gpu::CAAlgo::sort(data, data + dataLength);
-  }
-}
-
-__global__ void sortInThreadWithOperator(float* data, size_t dataLength)
-{
-  // make sure only one thread is working on this.
-  if (hipBlockIdx_x == 0 && hipBlockIdx_y == 0 && hipBlockIdx_z == 0 && hipThreadIdx_x == 0 && hipThreadIdx_y == 0 && hipThreadIdx_z == 0) {
-    o2::gpu::CAAlgo::sort(data, data + dataLength, [](float a, float b) { return a < b; });
-  }
-}
-
-///////////////////////////////////////////////////////////////
-
-__global__ void sortInBlock(float* data, size_t dataLength)
-{
-  o2::gpu::CAAlgo::sortInBlock<float>(data, data + dataLength);
-}
-
-__global__ void sortInBlockWithOperator(float* data, size_t dataLength)
-{
-  o2::gpu::CAAlgo::sortInBlock(data, data + dataLength, [](float a, float b) { return a < b; });
-}
-///////////////////////////////////////////////////////////////
-
-BOOST_AUTO_TEST_SUITE(TestsortInThread)
-
-BOOST_FIXTURE_TEST_CASE(GPUsortThreadHIP, TestEnvironment)
-{
-  hipLaunchKernelGGL(sortInThread, dim3(1), dim3(1), 0, 0, data, size);
-  // sortInThread<<<dim3(1), dim3(1), 0, 0>>>(data, size);
-  BOOST_CHECK_EQUAL(hipCheckError(hipDeviceSynchronize()), hipSuccess);
-  testAlmostEqualArray(sorted.data(), data, size);
-}
-
-BOOST_FIXTURE_TEST_CASE(GPUsortThreadOperatorHIP, TestEnvironment)
-{
-  hipLaunchKernelGGL(sortInThreadWithOperator, dim3(1), dim3(1), 0, 0, data, size);
-  // sortInThreadWithOperator<<<dim3(1), dim3(1), 0, 0>>>(data, size);
-  BOOST_CHECK_EQUAL(hipCheckError(hipDeviceSynchronize()), hipSuccess);
-  testAlmostEqualArray(sorted.data(), data, size);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(TestsortInBlock)
-
-BOOST_FIXTURE_TEST_CASE(GPUsortBlockHIP, TestEnvironment)
-{
-  hipLaunchKernelGGL(sortInBlock, dim3(1), dim3(128), 0, 0, data, size);
-  // sortInBlock<<<dim3(1), dim3(128), 0, 0>>>(data, size);
-  BOOST_CHECK_EQUAL(hipCheckError(hipDeviceSynchronize()), hipSuccess);
-  testAlmostEqualArray(sorted.data(), data, size);
-}
-
-BOOST_FIXTURE_TEST_CASE(GPUsortBlockOperatorHIP, TestEnvironment)
-{
-  hipLaunchKernelGGL(sortInBlockWithOperator, dim3(1), dim3(128), 0, 0, data, size);
-  // sortInBlockWithOperator<<<dim3(1), dim3(128), 0, 0>>>(data, size);
-  BOOST_CHECK_EQUAL(hipCheckError(hipDeviceSynchronize()), hipSuccess);
-  testAlmostEqualArray(sorted.data(), data, size);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/GPU/GPUTracking/DataCompression/standalone-cluster-dump-entropy-analysed.cxx b/GPU/GPUTracking/DataCompression/standalone-cluster-dump-entropy-analysed.cxx
deleted file mode 100644
index b23d19c3c9cd4..0000000000000
--- a/GPU/GPUTracking/DataCompression/standalone-cluster-dump-entropy-analysed.cxx
+++ /dev/null
@@ -1,709 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file standalone-cluster-dump-entropy-analysed.cxx
-/// \author David Rohr
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <math.h>
-#include <queue>
-#include <map>
-#include <iterator>
-#include <algorithm>
-#include <iostream>
-
-const int32_t sort_method = 1; // 0 No sorting, 1 sort after pad, 2 sort after time, 3/4 mixed methods favoring pad / time
-const int32_t sector_diff = 1;
-const int32_t row_diff = 1;
-const int32_t pad_diff = 1;
-const int32_t time_diff = 1;
-const int32_t res_diff = 0;
-const int32_t approximate_qtot = 0;
-const int32_t combine_maxtot = 1;
-const int32_t combine_sigmapadtime = 1;
-const int32_t track_based = 1;
-const int32_t track_avgtot = track_based && 0;
-const int32_t track_avgmax = track_based && 0;
-const int32_t track_diffqtot = track_based && 0;
-const int32_t track_diffqmax = track_based && 0;
-const int32_t track_separate_q = track_based && 1;
-const int32_t track_diffsigma = track_based && 0;
-const int32_t track_separate_sigma = track_based && 1;
-const int32_t truncate_bits = 1;
-const int32_t separate_sectors = 0;
-const int32_t separate_patches = 0;
-const int32_t separate_sides = 0;
-const int32_t full_row_numbers = 1;
-const int32_t distinguish_rows = 0;
-const int32_t optimized_negative_values = 1;
-
-const int32_t print_clusters = 0;
-
-const char* file = "clusters-pbpb.dump";
-const int32_t max_clusters = 2000000;
-
-const int32_t truncate_sigma = 3;
-const int32_t truncate_charge = 4;
-
-const int32_t sort_pad_mixed_bins = 100;
-const int32_t sort_time_mixed_bins = 400;
-
-#define EVENT 0
-#define SECTOR 1
-#define PATCH 2
-#define ROW 3
-#define PAD 4
-#define TIME 5
-#define SIGMA_PAD 6
-#define SIGMA_TIME 7
-#define QMAX 8
-#define QTOT 9
-#define FLAG_PADTIME 10
-#define CLUSTER_ID 11
-#define RES_PAD 12
-#define RES_TIME 13
-#define AVG_TOT 14
-#define AVG_MAX 15
-#define QMAX_QTOT 16
-#define SIGMA_PAD_TIME 17
-#define DIFF_SIGMA_PAD 18
-#define DIFF_SIGMA_TIME 19
-#define DIFF_SIGMA_PAD_TIME 20
-#define AVG_TOT_MAX 21
-#define ROW_TRACK_FIRST 22
-#define ROW_TRACK 23
-
-#define PAD_80 24
-#define PAD_92 25
-#define PAD_104 26
-#define PAD_116 27
-#define PAD_128 28
-#define PAD_140 29
-
-const int32_t rr = optimized_negative_values && 0 ? 13 : 14; // We can make them all 14 for convenience, the encoding will handle it
-
-const uint32_t field_bits[] = {0, 6, 0, 8, 14, 15, 8, 8, 10, 16, 2, 0, 14, 15, 16, 10, 26, 16, 8, 8, 16, 26, 8, 8, rr, rr, rr, rr, rr, 14};
-const uint32_t significant_bits[] = {0, 6, 0, 8, 14, 15, truncate_sigma, truncate_sigma, truncate_charge, truncate_charge, 2, 0, 14, 15, truncate_charge, truncate_charge, 26, 16, truncate_sigma, truncate_sigma, 16, 26, 8, 8, rr, rr, rr, rr, rr, 14};
-const int32_t nFields = sizeof(field_bits) / sizeof(field_bits[0]);
-const char* field_names[] = {"event", "sector", "patch", "row", "pad", "time", "sigmaPad", "sigmaTime", "qmax", "qtot", "flagPadTime", "trackID", "resTrackPad",
-                             "resTrackTime", "trackQTot", "trackQMax", "qmaxtot", "sigmapadtime", "diffsigmapad", "diffsigmatime", "diffsigmapadtime", "tracktotmax", "trackfirstrow", "trackrow", "pad_80", "pad_92",
-                             "pad_104", "pad_116", "pad_128", "pad_140"};
-
-union cluster_struct {
-  struct
-  {
-    uint32_t event, sector, patch, row, pad, time, sigmaPad, sigmaTime, qmax, qtot, splitPadTime;
-    int32_t trackID;
-    uint32_t resPad, resTime, avgtot, avgmax;
-  };
-  uint32_t vals[16];
-};
-
-int32_t fgRows[6][2] = {{0, 30}, {30, 62}, {63, 90}, {90, 116}, {117, 139}, {139, 158}};
-int32_t fgNRows[6] = {31, 33, 28, 27, 23, 20};
-
-int32_t fgNPads[159] = {68, 68, 68, 68, 70, 70, 70, 72, 72, 72, 74, 74, 74, 76, 76, 76, 78, 78, 78, 80, 80, 80, 82, 82, 82, 84, 84, 84, 86, 86, 86, 88, 88, 88, 90, 90, 90, 92, 92, 92, 94, 94, 94, 96, 96, 96, 98, 98, 98, 100, 100, 100, 102,
-                        102, 102, 104, 104, 104, 106, 106, 106, 108, 108, 74, 76, 76, 76, 76, 78, 78, 78, 80, 80, 80, 80, 82, 82, 82, 84, 84, 84, 86, 86, 86, 86, 88, 88, 88, 90, 90, 90, 90, 92, 92, 92, 94, 94, 94, 96, 96, 96, 96, 98, 98, 98, 100,
-                        100, 100, 100, 102, 102, 102, 104, 104, 104, 106, 106, 106, 106, 108, 108, 108, 110, 110, 110, 110, 112, 112, 114, 114, 114, 116, 116, 118, 118, 120, 120, 122, 122, 122, 124, 124, 126, 126, 128, 128, 130, 130, 130, 132, 132, 134, 134, 136, 136, 138, 138, 138, 140};
-
-int32_t fgNPadsMod[159] = {80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-                           104, 104, 104, 104, 104, 116, 116, 116, 116, 116, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-                           104, 104, 104, 104, 104, 104, 104, 104, 104, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 128, 128, 128, 128, 128, 128, 128, 128, 128, 126, 126, 128, 128, 140, 140, 140, 140, 140, 134, 134, 140, 140, 140, 140, 140, 140};
-
-// ---------------------------------- HUFFMAN TREE
-
-typedef std::vector<bool> HuffCode;
-typedef std::map<uint32_t, HuffCode> HuffCodeMap;
-
-class INode
-{
- public:
-  const double f;
-
-  virtual ~INode() {}
-
- protected:
-  INode(double f) : f(f) {}
-};
-
-class InternalNode : public INode
-{
- public:
-  INode* const left;
-  INode* const right;
-
-  InternalNode(INode* c0, INode* c1) : INode(c0->f + c1->f), left(c0), right(c1) {}
-  ~InternalNode()
-  {
-    delete left;
-    delete right;
-  }
-};
-
-class LeafNode : public INode
-{
- public:
-  const uint32_t c;
-
-  LeafNode(double f, uint32_t c) : INode(f), c(c) {}
-};
-
-struct NodeCmp {
-  bool operator()(const INode* lhs, const INode* rhs) const { return lhs->f > rhs->f; }
-};
-
-INode* BuildTree(const double* frequencies, uint32_t UniqueSymbols)
-{
-  std::priority_queue<INode*, std::vector<INode*>, NodeCmp> trees;
-
-  for (int32_t i = 0; i < UniqueSymbols; i++) {
-    if (frequencies[i] != 0) {
-      trees.push(new LeafNode(frequencies[i], i));
-    }
-  }
-  while (trees.size() > 1) {
-    INode* childR = trees.top();
-    trees.pop();
-
-    INode* childL = trees.top();
-    trees.pop();
-
-    INode* parent = new InternalNode(childR, childL);
-    trees.push(parent);
-  }
-  return trees.top();
-}
-
-void GenerateCodes(const INode* node, const HuffCode& prefix, HuffCodeMap& outCodes)
-{
-  if (const LeafNode* lf = dynamic_cast<const LeafNode*>(node)) {
-    outCodes[lf->c] = prefix;
-  } else if (const InternalNode* in = dynamic_cast<const InternalNode*>(node)) {
-    HuffCode leftPrefix = prefix;
-    leftPrefix.push_back(false);
-    GenerateCodes(in->left, leftPrefix, outCodes);
-
-    HuffCode rightPrefix = prefix;
-    rightPrefix.push_back(true);
-    GenerateCodes(in->right, rightPrefix, outCodes);
-  }
-}
-
-//--------------------------------------------- END HUFFMAN
-
-bool clustercompare_padtime(cluster_struct a, cluster_struct b) { return (a.pad < b.pad || (a.pad == b.pad && a.time < b.time)); }
-
-bool clustercompare_timepad(cluster_struct a, cluster_struct b) { return (a.time < b.time || (a.time == b.time && a.pad < b.pad)); }
-
-bool clustercompare_padtime_mixed(cluster_struct a, cluster_struct b) { return (a.pad / sort_pad_mixed_bins < b.pad / sort_pad_mixed_bins || (a.pad / sort_pad_mixed_bins == b.pad / sort_pad_mixed_bins && a.time < b.time)); }
-
-bool clustercompare_timepad_mixed(cluster_struct a, cluster_struct b) { return (a.time / sort_time_mixed_bins < b.time / sort_time_mixed_bins || (a.time / sort_time_mixed_bins == b.time / sort_time_mixed_bins && a.pad < b.pad)); }
-
-bool clustercompare_inevent(cluster_struct a, cluster_struct b) { return (a.sector < b.sector || (a.sector == b.sector && a.patch < b.patch) || (a.sector == b.sector && a.patch == b.patch && a.row < b.row)); }
-
-void do_diff(uint32_t& val, int32_t& last, uint32_t bits, uint32_t maxval = 0)
-{
-  int32_t tmp = val;
-  val -= last;
-  if (maxval && optimized_negative_values) {
-    while ((signed)val < 0) {
-      val += maxval;
-    }
-  } else {
-    val &= (1 << bits) - 1;
-  }
-  last = tmp;
-}
-
-uint32_t truncate(int32_t j, uint32_t val)
-{
-  if (truncate_bits && field_bits[j] != significant_bits[j] && val) {
-    int32_t ldz = sizeof(uint32_t) * 8 - __builtin_clz(val);
-    if (ldz > significant_bits[j]) {
-      val &= ((1 << ldz) - 1) ^ ((1 << (ldz - significant_bits[j])) - 1);
-    }
-  }
-  return (val);
-}
-
-int32_t main(int argc, char** argv)
-{
-  FILE* fp;
-
-  if (truncate_bits && (track_avgmax || track_diffqmax || track_diffqtot)) {
-    printf("Cannot use truncate bits with differential qmax / qtot");
-    return (1);
-  }
-  if (truncate_bits && (track_diffsigma)) {
-    printf("Cannot use truncate bits with differential sigma");
-    return (1);
-  }
-
-  if (!(fp = fopen(file, "rb"))) {
-    printf("Error opening file\n");
-    return (1);
-  }
-
-  fseek(fp, 0, SEEK_END);
-  size_t nFileSize = ftell(fp);
-  fseek(fp, 0, SEEK_SET);
-
-  size_t nClusters = nFileSize / sizeof(cluster_struct);
-  if (max_clusters && nClusters > max_clusters) {
-    nClusters = max_clusters;
-  }
-
-  cluster_struct* clusters = new cluster_struct[nClusters];
-  if (clusters == NULL) {
-    printf("Memory allocation error\n");
-    return (1);
-  }
-
-  fprintf(stderr, "Reading %d clusters...", (int32_t)nClusters);
-  fread(clusters, sizeof(cluster_struct), nClusters, fp);
-
-  fprintf(stderr, "Done\nSorting clusters...");
-
-  if (sort_method) {
-    int32_t starti = 0;
-    if (!track_based) {
-      fprintf(stderr, " (removing track ordering)...");
-      int32_t last_event = 0;
-      for (int32_t i = 0; i <= nClusters; i++) {
-        int32_t event = (i == nClusters ? -1 : clusters[i].event);
-        if (last_event != event) {
-          if (i - 1 > starti) {
-            std::sort(clusters + starti, clusters + i - 1, clustercompare_inevent);
-          }
-          starti = i;
-        }
-        last_event = event;
-      }
-    }
-
-    starti = 0;
-    int32_t startrow = -1;
-    for (int32_t i = 0; i <= nClusters; i++) {
-      int32_t currow;
-      if (i == nClusters) {
-        currow = -1;
-      } else if (track_based && clusters[i].trackID != -1) {
-        currow = -2;
-      } else {
-        currow = clusters[i].row;
-      }
-      if (currow != startrow && startrow != -2) {
-        if (i - 1 > starti) {
-          if (sort_method == 1) {
-            std::sort(clusters + starti, clusters + i - 1, clustercompare_padtime);
-          } else if (sort_method == 2) {
-            std::sort(clusters + starti, clusters + i - 1, clustercompare_timepad);
-          } else if (sort_method == 3) {
-            std::sort(clusters + starti, clusters + i - 1, clustercompare_padtime_mixed);
-          } else if (sort_method == 4) {
-            std::sort(clusters + starti, clusters + i - 1, clustercompare_timepad_mixed);
-          }
-        }
-        starti = i;
-        startrow = currow;
-      }
-    }
-  }
-  fprintf(stderr, "Done\n");
-
-  fclose(fp);
-
-  int64_t* histograms[nFields];
-  double* probabilities[nFields];
-  int64_t counts[nFields];
-  int32_t used[nFields];
-  for (int32_t i = SECTOR; i < nFields; i++) {
-    if (i == CLUSTER_ID) {
-      continue;
-    }
-    histograms[i] = new int64_t[1 << field_bits[i]];
-    probabilities[i] = new double[1 << field_bits[i]];
-  }
-
-  double rawtotalbytes = 0;
-  double entrototalbytes = 0;
-  for (int32_t isector = 0; isector < 36; isector++) {
-    for (int32_t ipatch = 0; ipatch < 6; ipatch++) {
-      if (separate_sectors) {
-        printf("SECTOR %d ", isector);
-      }
-      if (separate_patches) {
-        printf("PATCH %d", ipatch);
-      }
-      if (separate_sectors || separate_patches) {
-        printf("\n");
-      }
-      for (int32_t i = SECTOR; i < nFields; i++) {
-        if (i == CLUSTER_ID || i == PATCH) {
-          continue;
-        }
-        memset(histograms[i], 0, sizeof(int64_t) * (1 << field_bits[i]));
-        counts[i] = 0;
-        used[i] = 0;
-      }
-
-      size_t nClustersUsed = 0;
-
-      int32_t lastRow = 0, lastPad = 0, lastTime = 0, lastSector = 0, lastResPad = 0, lastResTime = 0, lastQTot = 0, lastQMax = 0, lastSigmaPad = 0, lastSigmaTime = 0, lastTrack = -1, lastEvent = 0;
-
-      for (size_t i = 0; i < nClusters; i++) {
-        const cluster_struct& cluster_org = clusters[i];
-        cluster_struct cluster = clusters[i];
-        if (cluster.pad >= 32768) {
-          printf("%d\n", cluster.pad);
-        }
-
-        if ((separate_sectors && cluster.sector != isector) || (separate_patches && cluster.patch != ipatch)) {
-          continue;
-        }
-        if (separate_sides && !(cluster.sector < 18 ^ isector < 18)) {
-          continue;
-        }
-
-        bool newTrack = lastTrack != cluster.trackID;
-        uint32_t dSigmaPad, dSigmaTime;
-
-        if (cluster.event != lastEvent) {
-          lastRow = lastPad = lastTime = lastSector = 0;
-          lastTrack = -1;
-        }
-
-        if (full_row_numbers) {
-          cluster.row += fgRows[cluster.patch][0];
-        }
-
-        if ((sector_diff || res_diff || track_diffqtot || track_diffqmax) && cluster.trackID != -1 && track_based) {
-          if (lastTrack != cluster.trackID) {
-            lastSector = lastResPad = lastResTime = lastQTot = lastQMax = lastSigmaPad = lastSigmaTime = 0;
-          }
-
-          if (sector_diff) {
-            do_diff(cluster.sector, lastSector, field_bits[SECTOR]);
-          }
-
-          if (res_diff) {
-            do_diff(cluster.resPad, lastResPad, field_bits[RES_PAD]);
-            do_diff(cluster.resTime, lastResTime, field_bits[RES_TIME]);
-          }
-
-          if (track_diffqtot) {
-            cluster.avgtot = cluster.qtot;
-            do_diff(cluster.avgtot, lastQTot, field_bits[QTOT]);
-          }
-          if (track_diffqmax) {
-            cluster.avgmax = cluster.qmax;
-            do_diff(cluster.avgmax, lastQMax, field_bits[QMAX]);
-          }
-          if (track_diffsigma) {
-            dSigmaPad = cluster.sigmaPad;
-            dSigmaTime = cluster.sigmaTime;
-            do_diff(dSigmaPad, lastSigmaPad, field_bits[SIGMA_PAD]);
-            do_diff(dSigmaTime, lastSigmaTime, field_bits[SIGMA_TIME]);
-          } else if (track_separate_sigma) {
-            dSigmaPad = truncate(SIGMA_PAD, cluster.sigmaPad);
-            dSigmaTime = truncate(SIGMA_TIME, cluster.sigmaTime);
-          }
-        }
-
-        if (cluster.row != lastRow) {
-          lastPad = lastTime = 0;
-        }
-        if (row_diff) {
-          do_diff(cluster.row, lastRow, field_bits[ROW]);
-        } else {
-          lastRow = cluster.row;
-        }
-
-        if (pad_diff && (cluster.trackID == -1 || !track_based)) {
-          do_diff(cluster.pad, lastPad, field_bits[PAD], (distinguish_rows ? fgNPadsMod[cluster_org.row + fgRows[cluster.patch][0]] : 140) * 60);
-        }
-        if (time_diff && (cluster.trackID == -1 || !track_based)) {
-          do_diff(cluster.time, lastTime, field_bits[TIME], 1024 * 25);
-        }
-
-        if (approximate_qtot && (!track_based || cluster.trackID == -1 || (track_avgtot == 0 && track_diffqtot == 0))) {
-          cluster.qtot -= cluster.sigmaPad * cluster.qmax / 3;
-          if (cluster.qtot < 0) {
-            cluster.qtot = -truncate(QTOT, -cluster.qtot);
-          } else {
-            cluster.qtot = truncate(QTOT, cluster.qtot);
-          }
-          cluster.qtot &= (1 << field_bits[QTOT]) - 1;
-        }
-
-        if (track_avgtot && cluster.trackID != -1) {
-          int32_t tmp = truncate(QTOT, cluster.qtot) - truncate(QTOT, cluster.avgtot);
-          if (newTrack) {
-            cluster.qtot = truncate(QTOT, cluster.avgtot);
-          }
-          cluster.avgtot = tmp & ((1 << field_bits[QTOT]) - 1);
-        }
-        if (track_avgmax && cluster.trackID != -1) {
-          int32_t tmp = cluster.qmax - cluster.avgmax;
-          if (newTrack) {
-            cluster.qmax = cluster.avgmax;
-          }
-          cluster.avgmax = tmp & ((1 << field_bits[QMAX]) - 1);
-        }
-
-        // Copy qmax / qtot to combined track avg... slot, to use for combine_maxtot
-        if ((((combine_maxtot && (track_avgtot || track_diffqtot)) || track_separate_q) && track_avgmax == 0 && track_diffqmax == 0) && cluster.trackID != -1) {
-          cluster.avgmax = cluster.qmax;
-        }
-        if ((((combine_maxtot && (track_avgmax || track_diffqmax)) || track_separate_q) && track_avgtot == 0 && track_diffqtot == 0) && cluster.trackID != -1) {
-          cluster.avgtot = cluster.qtot;
-        }
-
-        for (int32_t j = 0; j < sizeof(cluster_struct) / sizeof(uint32_t); j++) {
-          if (approximate_qtot && (j == QTOT || j == AVG_TOT)) {
-            continue;
-          }
-          if (track_avgtot && (j == QTOT || j == AVG_TOT)) {
-            continue;
-          }
-          cluster.vals[j] = truncate(j, cluster.vals[j]);
-        }
-
-        lastEvent = cluster.event;
-        lastTrack = cluster.trackID;
-
-        if (print_clusters > 0 || (print_clusters < 0 && i < -print_clusters)) {
-          printf("Event %u Track %d Sector %u Patch %u Row %u Pad %u Time %u sigmaPad %u sigmaTime %u qTot %u qMax %u Flag %u resPad %u resTime %u avgTot %u avgMax %u\n", cluster.event, cluster.trackID, cluster.sector, cluster.patch, cluster.row, cluster.pad, cluster.time, cluster.sigmaPad,
-                 cluster.sigmaTime, cluster.qtot, cluster.qmax, cluster.splitPadTime, cluster.resPad, cluster.resTime, cluster.avgtot, cluster.avgmax);
-        }
-
-        for (int32_t j = SECTOR; j < nFields; j++) {
-          bool forceStore = false;
-          if (j == CLUSTER_ID || j == PATCH) {
-            continue;
-          }
-
-          if (j == SECTOR && (track_based == 0 || cluster.trackID == -1)) {
-            continue;
-          }
-
-          if (track_based && cluster.trackID != -1 && !newTrack) {
-            if (j == PAD || j == TIME || (j >= PAD_80 && j <= PAD_140)) {
-              continue;
-            }
-            if (j == RES_PAD || j == RES_TIME) {
-              cluster.vals[j] &= (1 << field_bits[j]) - 1;
-              forceStore = true;
-            }
-          }
-
-          if ((track_avgtot || track_diffqtot || track_separate_q) && cluster.trackID != -1) {
-            if (j == QTOT && (!newTrack || (track_avgtot == 0 && track_diffqtot == 0))) {
-              continue;
-            }
-            if (j == AVG_TOT && (track_diffqtot == 0 || !newTrack)) {
-              forceStore = true;
-            }
-          }
-          if ((track_avgmax || track_diffqmax || track_separate_q) && cluster.trackID != -1) {
-            if (j == QMAX && (!newTrack || (track_avgmax == 0 && track_diffqmax == 0))) {
-              continue;
-            }
-            if (j == AVG_MAX && (track_diffqmax == 0 || !newTrack)) {
-              forceStore = true;
-            }
-          }
-
-          if ((track_diffsigma || track_separate_sigma) && cluster.trackID != -1) {
-            if (j == SIGMA_PAD || j == SIGMA_TIME) {
-              continue;
-            }
-            if (j == DIFF_SIGMA_PAD) {
-              histograms[j][dSigmaPad]++;
-              counts[j]++;
-            }
-            if (j == DIFF_SIGMA_TIME) {
-              histograms[j][dSigmaTime]++;
-              counts[j]++;
-            }
-          }
-
-          if (track_based && row_diff && cluster.trackID != -1) {
-            if (j == ROW) {
-              continue;
-            }
-            int32_t myj = newTrack ? ROW_TRACK_FIRST : ROW_TRACK;
-            if (j == myj) {
-              histograms[myj][cluster.vals[ROW]]++;
-              counts[myj]++;
-            }
-          }
-
-          if (j <= FLAG_PADTIME || forceStore) {
-            if (cluster.vals[j] >= (1 << field_bits[j])) {
-              printf("Cluster value %d/%s out of bit range %d > %d\n", j, field_names[j], cluster.vals[j], (1 << field_bits[j]));
-            } else {
-              histograms[j][cluster.vals[j]]++;
-              counts[j]++;
-            }
-          } else if (j == QMAX_QTOT && (!track_based || cluster.trackID == -1 || (((track_avgmax == 0 && track_avgtot == 0 && track_diffqmax == 0 && track_diffqtot == 0) || newTrack) && track_separate_q == 0))) {
-            int32_t val = (cluster.qtot << field_bits[QMAX]) | cluster.qmax;
-            histograms[j][val]++;
-            counts[j]++;
-          } else if (((track_avgmax || track_avgtot || track_diffqmax || track_diffqtot) && !newTrack || track_separate_q) && cluster.trackID != -1 && j == AVG_TOT_MAX) {
-            int32_t val = (cluster.avgtot << field_bits[QMAX]) | cluster.avgmax;
-            histograms[j][val]++;
-            counts[j]++;
-          } else if (j == SIGMA_PAD_TIME && (!track_based || cluster.trackID == -1 || (track_diffsigma == 0 && track_separate_sigma == 0))) {
-            int32_t val = (cluster.sigmaTime << field_bits[SIGMA_PAD]) | cluster.sigmaPad;
-            histograms[j][val]++;
-            counts[j]++;
-          } else if ((track_diffsigma || track_separate_sigma) && cluster.trackID != -1 && j == DIFF_SIGMA_PAD_TIME) {
-            int32_t val = (dSigmaPad << field_bits[SIGMA_PAD]) | dSigmaTime;
-            histograms[j][val]++;
-            counts[j]++;
-          } else if (distinguish_rows && j >= PAD_80 && j <= PAD_140) {
-            int32_t myj = fgNPads[cluster_org.row + fgRows[cluster.patch][0]];
-            myj = (myj - (80 - 11)) / 12;
-            myj += PAD_80;
-            if (myj == j) {
-              if (cluster.pad >= (1 << field_bits[j])) {
-                printf("Cluster value %d/%s out of bit range %d > %d\n", j, field_names[j], cluster.vals[j], (1 << field_bits[j]));
-              } else {
-                histograms[j][cluster.pad]++;
-                counts[j]++;
-              }
-            }
-          }
-        }
-        nClustersUsed++;
-      }
-
-      printf("Clusters in block: %ld / %ld\n", nClustersUsed, nClusters);
-
-      double log2 = log(2.);
-      double entropies[nFields];
-      double huffmanSizes[nFields];
-      for (int32_t i = SECTOR; i < nFields; i++) {
-        if (i == CLUSTER_ID || i == PATCH) {
-          continue;
-        }
-        double entropy = 0.;
-        double huffmanSize = 0;
-
-        if (counts[i]) {
-          for (int32_t j = 0; j < (1 << field_bits[i]); j++) {
-            // printf("Field %d/%s Value %d Entries %ld\n", i, field_names[i], j, histograms[i][j]);
-
-            probabilities[i][j] = (double)histograms[i][j] / (double)counts[i];
-            if (probabilities[i][j]) {
-              double I = -log(probabilities[i][j]) / log2;
-              double H = I * probabilities[i][j];
-              // printf("Field %d/%s Value %d I prob %f I %f H %f\n", i, field_names[i], probabilities[i][j], I, H);
-
-              entropy += H;
-            }
-          }
-
-          INode* root = BuildTree(probabilities[i], 1 << field_bits[i]);
-
-          HuffCodeMap codes;
-          GenerateCodes(root, HuffCode(), codes);
-          delete root;
-
-          for (HuffCodeMap::const_iterator it = codes.begin(); it != codes.end(); it++) {
-            huffmanSize += it->second.size() * probabilities[i][it->first];
-          }
-        }
-        entropies[i] = entropy;
-        huffmanSizes[i] = huffmanSize;
-      }
-
-      int32_t rawBits = 0;
-      double entroTotal = 0., huffmanTotal = 0.;
-      for (int32_t i = SECTOR; i < nFields; i++) {
-        if (i == CLUSTER_ID || i == PATCH) {
-          continue;
-        }
-
-        if (i <= FLAG_PADTIME) {
-          rawBits += field_bits[i];
-        }
-
-        if (combine_maxtot && (i == QMAX || i == QTOT)) {
-          continue;
-        }
-        if (combine_sigmapadtime && (i == SIGMA_PAD || i == SIGMA_TIME)) {
-          continue;
-        }
-        if ((track_diffsigma || track_separate_sigma) && combine_sigmapadtime && (i == DIFF_SIGMA_PAD || i == DIFF_SIGMA_TIME)) {
-          continue;
-        }
-
-        if (distinguish_rows && i == PAD) {
-          continue;
-        }
-
-        if (i <= FLAG_PADTIME || (combine_maxtot && i == QMAX_QTOT) || (combine_maxtot && (track_avgmax || track_avgtot || track_diffqmax || track_diffqtot || track_separate_q) && combine_maxtot && i == AVG_TOT_MAX) || (combine_sigmapadtime && i == SIGMA_PAD_TIME) ||
-            (combine_sigmapadtime && (track_diffsigma || track_separate_sigma) && i == DIFF_SIGMA_PAD_TIME) || (track_based && (i == RES_PAD || i == RES_TIME)) || ((track_avgtot || track_diffqtot || track_separate_q) && !combine_maxtot && i == AVG_TOT) ||
-            ((track_avgmax || track_diffqmax || track_separate_q) && !combine_maxtot && i == AVG_MAX) || ((track_diffsigma || track_separate_sigma) && (i == DIFF_SIGMA_PAD || i == DIFF_SIGMA_TIME)) || (track_based && row_diff && (i == ROW_TRACK || i == ROW_TRACK_FIRST)) ||
-            (distinguish_rows && i >= PAD_80 && i <= PAD_140)) {
-          entroTotal += entropies[i] * counts[i];
-          huffmanTotal += huffmanSizes[i] * counts[i];
-          used[i] = 1;
-        }
-      }
-      for (int32_t i = SECTOR; i < nFields; i++) {
-        if (field_bits[i] == 0) {
-          continue;
-        }
-        if (counts[i] == 0) {
-          continue;
-        }
-        printf("Field %2d/%16s (count %10ld / used %1d) rawBits %2d huffman %9.6f entropy %9.6f\n", i, field_names[i], counts[i], used[i], field_bits[i], huffmanSizes[i], entropies[i]);
-      }
-      rawBits = 79; // Override incorrect calculation: Row is only 6 bit in raw format, and sector is not needed!
-      printf("Raw Bits: %d - Total Size %f MB Clusters %d\n", rawBits, (double)rawBits * (double)nClustersUsed / 8. / 1.e6, nClustersUsed);
-      printf("Huffman Bits: %f - Total Size %f MB\n", huffmanTotal / (double)nClustersUsed, huffmanTotal / 8. / 1.e6);
-      printf("Entropy Bits: %f - Total Size %f MB\n", entroTotal / (double)nClustersUsed, entroTotal / 8. / 1.e6);
-      printf("Maximum Compression Ratio: %f (Huffman %f)\n", (double)rawBits * (double)nClustersUsed / entroTotal, (double)rawBits * (double)nClustersUsed / huffmanTotal);
-      entrototalbytes += entroTotal;
-      rawtotalbytes += (double)rawBits * (double)nClustersUsed;
-
-      if (separate_sides && !separate_sectors && isector == 0) {
-        isector = 17;
-      } else if (!separate_sectors) {
-        isector = 9999999;
-      }
-
-      if (!separate_patches) {
-        ipatch = 9999999;
-      }
-    }
-  }
-
-  if (separate_sectors || separate_patches || separate_sides) {
-    printf("Total Compression: %f\n", rawtotalbytes / entrototalbytes);
-  }
-
-  printf("Exiting\n");
-  for (int32_t i = SECTOR; i < nFields; i++) {
-    if (i == CLUSTER_ID || i == PATCH) {
-      continue;
-    }
-    delete[] histograms[i];
-    delete[] probabilities[i];
-  }
-  delete[] clusters;
-  return (0);
-}
diff --git a/GPU/GPUTracking/GPUTrackingLinkDef_Standalone.h b/GPU/GPUTracking/GPUTrackingLinkDef_Standalone.h
deleted file mode 100644
index 39b90430da7bc..0000000000000
--- a/GPU/GPUTracking/GPUTrackingLinkDef_Standalone.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file GPUTrackingLinkDef_Standalone.h
-/// \author David Rohr
-
-#ifdef __CLING__
-
-#include "GPUTrackingLinkDef_O2.h"
-#include "GPUTrackingLinkDef_O2_DataTypes.h"
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class o2::tpc::ClusterNative + ;
-#pragma link C++ class o2::tpc::TrackTPC + ;
-#pragma link C++ class o2::track::TrackParametrization < float> + ;
-#pragma link C++ class o2::track::TrackParametrizationWithError < float> + ;
-#pragma link C++ class o2::dataformats::RangeReference < uint32_t, uint16_t> + ;
-#pragma link C++ class o2::tpc::dEdxInfo + ;
-#pragma link C++ class o2::track::PID + ;
-
-#endif
diff --git a/GPU/GPUTracking/SectorTracker/GPUTPCDefinitions.h b/GPU/GPUTracking/SectorTracker/GPUTPCDefinitions.h
deleted file mode 100644
index 7d9d607b9b88d..0000000000000
--- a/GPU/GPUTracking/SectorTracker/GPUTPCDefinitions.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file GPUTPCDefinitions.h
-/// \author Sergey Gorbunov, David Rohr
-
-#ifndef GPUTPCDEFINITIONS_H
-#define GPUTPCDEFINITIONS_H
-
-#include "AliHLTDataTypes.h"
-
-namespace GPUTPCDefinitions
-{
-extern const AliHLTComponentDataType fgkTrackletsDataType;
-}
-
-#endif // GPUTPCDEFINITIONS_H
diff --git a/GPU/GPUTracking/Standalone/tools/GPUExtractPbPbCollision.h b/GPU/GPUTracking/Standalone/tools/GPUExtractPbPbCollision.h
deleted file mode 100644
index b83d2c40be81c..0000000000000
--- a/GPU/GPUTracking/Standalone/tools/GPUExtractPbPbCollision.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file GPUExtractPbPbCollision.h
-/// \author David Rohr
-
-static void GPUExtractPbPbCollision(GPUParam& param, GPUTrackingInOutPointers& ioPtrs)
-{
-  std::vector<uint32_t> counts(param.continuousMaxTimeBin + 1);
-  std::vector<uint32_t> sums(param.continuousMaxTimeBin + 1);
-  std::vector<uint32_t> countsTracks(param.continuousMaxTimeBin + 1);
-  std::vector<uint32_t> sumsTracks(param.continuousMaxTimeBin + 1);
-  std::vector<bool> mask(param.continuousMaxTimeBin + 1);
-  const int32_t driftlength = 520;
-  const bool checkAfterGlow = true;
-  const int32_t afterGlowLength = checkAfterGlow ? 8000 : 0;
-  for (uint32_t i = 0; i < ioPtrs.clustersNative->nClustersTotal; i++) {
-    int32_t time = ioPtrs.clustersNative->clustersLinear[i].getTime();
-    if (time < 0 || time > param.continuousMaxTimeBin) {
-      fprintf(stderr, "Invalid time %d > %d\n", time, param.continuousMaxTimeBin);
-      throw std::runtime_error("Invalid Time");
-    }
-    counts[time]++;
-  }
-  for (uint32_t i = 0; i < ioPtrs.nMergedTracks; i++) {
-    if (ioPtrs.mergedTracks[i].NClusters() < 40) {
-      continue;
-    }
-    int32_t time = ioPtrs.mergedTracks[i].GetParam().GetTOffset();
-    if (time < 0 || time > param.continuousMaxTimeBin) {
-      continue;
-    }
-    countsTracks[time]++;
-  }
-  int32_t first = 0, last = 0;
-  for (int32_t i = driftlength; i < param.continuousMaxTimeBin; i++) {
-    if (counts[i]) {
-      first = i;
-      break;
-    }
-  }
-  for (int32_t i = param.continuousMaxTimeBin + 1 - driftlength; i > 0; i--) {
-    if (counts[i - 1]) {
-      last = i;
-      break;
-    }
-  }
-  uint32_t count = 0;
-  uint32_t countTracks = 0;
-  uint32_t min = 1e9;
-  uint64_t avg = 0;
-  for (int32_t i = first; i < last; i++) {
-    count += counts[i];
-    countTracks += countsTracks[i];
-    if (i - first >= driftlength) {
-      sums[i - driftlength] = count;
-      sumsTracks[i - driftlength] = countTracks;
-      if (count < min) {
-        min = count;
-      }
-      avg += count;
-      count -= counts[i - driftlength];
-      countTracks -= countsTracks[i - driftlength];
-    }
-  }
-  avg /= (last - first - driftlength);
-  printf("BASELINE Min %d Avg %d\n", min, (int32_t)avg);
-  /*for (int32_t i = first; i < last - driftlength; i++) {
-    printf("STAT %d: %u %u (trks %u)\n", i, sums[i], counts[i], sumsTracks[i]);
-  }*/
-  bool found = false;
-  do {
-    found = false;
-    uint32_t max = 0, maxpos = 0;
-    for (int32_t i = first; i < last - driftlength - afterGlowLength; i++) {
-      if (sums[i] > 10 * min && sums[i] > avg && sumsTracks[i] > 3) {
-        bool noColInAfterGlow = true;
-        if (checkAfterGlow) {
-          for (int32_t ii = i + driftlength; ii < i + driftlength + afterGlowLength; ii++) {
-            if (sums[ii] > 10 * min && sums[ii] > avg && sumsTracks[ii] > 3) {
-              noColInAfterGlow = false;
-            }
-          }
-        }
-        if (noColInAfterGlow && sums[i] > max) {
-          max = sums[i];
-          maxpos = i;
-          found = true;
-        }
-      }
-    }
-    if (found) {
-      uint32_t glow = 0;
-      uint32_t glowcount = 0;
-      if (checkAfterGlow) {
-        int32_t glowstart = maxpos + driftlength;
-        int32_t glowend = std::min<int32_t>(last, maxpos + driftlength + afterGlowLength);
-        for (int32_t i = glowstart; i < glowend; i++) {
-          glowcount++;
-          glow += counts[i];
-        }
-        // printf("AFTERGLOW RANGE %d %d\n", glowstart, glowend);
-      }
-      printf("MAX %d: %u (Tracks %u) Glow %d (%d)\n", maxpos, max, sumsTracks[maxpos], glow, glowcount);
-      for (int32_t i = std::max<int32_t>(first, maxpos - driftlength); i < std::min<int32_t>(last, maxpos + driftlength + afterGlowLength); i++) {
-        sums[i] = 0;
-        mask[i] = true;
-      }
-    }
-  } while (found && !checkAfterGlow);
-  uint32_t noise = 0;
-  uint32_t noisecount = 0;
-  for (int32_t i = first; i < last; i++) {
-    if (!mask[i]) {
-      noise += counts[i];
-      noisecount++;
-    }
-  }
-  printf("AVERAGE NOISE: %d\n", noise / noisecount);
-}
diff --git a/GPU/GPUTracking/display/frontend/GPUDisplayFrontendWindows.cxx b/GPU/GPUTracking/display/frontend/GPUDisplayFrontendWindows.cxx
deleted file mode 100644
index 30148e0cb00ee..0000000000000
--- a/GPU/GPUTracking/display/frontend/GPUDisplayFrontendWindows.cxx
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file GPUDisplayFrontendWindows.cxx
-/// \author David Rohr
-
-// Now the other headers
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include "GPUDisplayFrontendWindows.h"
-#include "backend/GPUDisplayBackend.h"
-#include "GPUDisplayGUIWrapper.h"
-#include "GPULogging.h"
-#include <windows.h>
-#include <winbase.h>
-#include <windowsx.h>
-
-using namespace o2::gpu;
-
-HDC hDC = nullptr;                                    // Private GDI Device Context
-HGLRC hRC = nullptr;                                  // Permanent Rendering Context
-HWND hWnd = nullptr;                                  // Holds Our Window Handle
-HINSTANCE hInstance;                                  // Holds The Instance Of The Application
-LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration For WndProc
-
-bool active = TRUE;     // Window Active Flag Set To TRUE By Default
-bool fullscreen = TRUE; // Fullscreen Flag Set To Fullscreen Mode By Default
-
-POINT mouseCursorPos;
-
-volatile int32_t mouseReset = false;
-
-void KillGLWindow() // Properly Kill The Window
-{
-  if (fullscreen) // Are We In Fullscreen Mode?
-  {
-    ChangeDisplaySettings(nullptr, 0); // If So Switch Back To The Desktop
-    ShowCursor(TRUE);                  // Show Mouse Pointer
-  }
-
-  if (hRC) // Do We Have A Rendering Context?
-  {
-    if (!wglMakeCurrent(nullptr, nullptr)) { // Are We Able To Release The DC And RC Contexts?
-      MessageBox(nullptr, "Release Of DC And RC Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
-    }
-
-    if (!wglDeleteContext(hRC)) { // Are We Able To Delete The RC?
-      MessageBox(nullptr, "Release Rendering Context Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
-    }
-    hRC = nullptr;
-  }
-
-  if (hDC && !ReleaseDC(hWnd, hDC)) // Are We Able To Release The DC
-  {
-    MessageBox(nullptr, "Release Device Context Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
-    hDC = nullptr;
-  }
-
-  if (hWnd && !DestroyWindow(hWnd)) // Are We Able To Destroy The Window?
-  {
-    MessageBox(nullptr, "Could Not Release hWnd.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
-    hWnd = nullptr;
-  }
-
-  if (!UnregisterClass("OpenGL", hInstance)) // Are We Able To Unregister Class
-  {
-    MessageBox(nullptr, "Could Not Unregister Class.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION);
-    hInstance = nullptr;
-  }
-}
-
-BOOL CreateGLWindow(char* title, int32_t width, int32_t height, int32_t bits, bool fullscreenflag)
-{
-  GLuint PixelFormat;                  // Holds The Results After Searching For A Match
-  WNDCLASS wc;                         // Windows Class Structure
-  DWORD dwExStyle;                     // Window Extended Style
-  DWORD dwStyle;                       // Window Style
-  RECT WindowRect;                     // Grabs Rectangle Upper Left / Lower Right Values
-  WindowRect.left = (int64_t)0;        // Set Left Value To 0
-  WindowRect.right = (int64_t)width;   // Set Right Value To Requested Width
-  WindowRect.top = (int64_t)0;         // Set Top Value To 0
-  WindowRect.bottom = (int64_t)height; // Set Bottom Value To Requested Height
-
-  fullscreen = fullscreenflag; // Set The Global Fullscreen Flag
-
-  hInstance = GetModuleHandle(nullptr);          // Grab An Instance For Our Window
-  wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; // Redraw On Size, And Own DC For Window.
-  wc.lpfnWndProc = (WNDPROC)WndProc;             // WndProc Handles Messages
-  wc.cbClsExtra = 0;                             // No Extra Window Data
-  wc.cbWndExtra = 0;                             // No Extra Window Data
-  wc.hInstance = hInstance;                      // Set The Instance
-  wc.hIcon = LoadIcon(nullptr, IDI_WINLOGO);     // Load The Default Icon
-  wc.hCursor = LoadCursor(nullptr, IDC_ARROW);   // Load The Arrow Pointer
-  wc.hbrBackground = nullptr;                    // No Background Required For GL
-  wc.lpszMenuName = nullptr;                     // We Don't Want A Menu
-  wc.lpszClassName = "OpenGL";                   // Set The Class Name
-
-  if (!RegisterClass(&wc)) // Attempt To Register The Window Class
-  {
-    MessageBox(nullptr, "Failed To Register The Window Class.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE; // Return FALSE
-  }
-
-  if (fullscreen) // Attempt Fullscreen Mode?
-  {
-    DEVMODE dmScreenSettings;                               // Device Mode
-    memset(&dmScreenSettings, 0, sizeof(dmScreenSettings)); // Makes Sure Memory's Cleared
-    dmScreenSettings.dmSize = sizeof(dmScreenSettings);     // Size Of The Devmode Structure
-    dmScreenSettings.dmPelsWidth = width;                   // Selected Screen Width
-    dmScreenSettings.dmPelsHeight = height;                 // Selected Screen Height
-    dmScreenSettings.dmBitsPerPel = bits;                   // Selected Bits Per Pixel
-    dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
-
-    if (ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) {
-      GPUError("The Requested Fullscreen Mode Is Not Supported By Your Video Card.");
-      return (FALSE);
-    }
-
-    dwExStyle = WS_EX_APPWINDOW;
-    dwStyle = WS_POPUP;
-    ShowCursor(FALSE);
-  } else {
-    dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; // Window Extended Style
-    dwStyle = WS_OVERLAPPEDWINDOW;                  // Windows Style
-  }
-
-  AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, dwExStyle);
-
-  // Create The Window
-  if (!(hWnd = CreateWindowEx(dwExStyle, "OpenGL", title, dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, WindowRect.right - WindowRect.left, WindowRect.bottom - WindowRect.top, nullptr, nullptr, hInstance, nullptr))) {
-    KillGLWindow();
-    MessageBox(nullptr, "Window Creation Error.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE;
-  }
-
-  static PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be
-    {
-      sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor
-      1,                             // Version Number
-      PFD_DRAW_TO_WINDOW |           // Format Must Support Window
-        PFD_SUPPORT_OPENGL |         // Format Must Support OpenGL
-        PFD_DOUBLEBUFFER,            // Must Support Double Buffering
-      PFD_TYPE_RGBA,                 // Request An RGBA Format
-      (uint8_t)bits,                 // Select Our Color Depth
-      0,
-      0,
-      0,
-      0,
-      0,
-      0, // Color Bits Ignored
-      0, // No Alpha Buffer
-      0, // Shift Bit Ignored
-      0, // No Accumulation Buffer
-      0,
-      0,
-      0,
-      0,              // Accumulation Bits Ignored
-      16,             // 16Bit Z-Buffer (Depth Buffer)
-      0,              // No Stencil Buffer
-      0,              // No Auxiliary Buffer
-      PFD_MAIN_PLANE, // Main Drawing Layer
-      0,              // Reserved
-      0,
-      0,
-      0 // Layer Masks Ignored
-    };
-
-  if (!(hDC = GetDC(hWnd))) // Did We Get A Device Context?
-  {
-    KillGLWindow();
-    MessageBox(nullptr, "Can't Create A GL Device Context.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE;
-  }
-
-  if (!(PixelFormat = ChoosePixelFormat(hDC, &pfd))) // Did Windows Find A Matching Pixel Format?
-  {
-    KillGLWindow();
-    MessageBox(nullptr, "Can't Find A Suitable PixelFormat.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE;
-  }
-
-  if (!SetPixelFormat(hDC, PixelFormat, &pfd)) // Are We Able To Set The Pixel Format?
-  {
-    KillGLWindow();
-    MessageBox(nullptr, "Can't Set The PixelFormat.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE;
-  }
-
-  if (!(hRC = wglCreateContext(hDC))) // Are We Able To Get A Rendering Context?
-  {
-    KillGLWindow();
-    MessageBox(nullptr, "Can't Create A GL Rendering Context.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE;
-  }
-
-  if (!wglMakeCurrent(hDC, hRC)) // Try To Activate The Rendering Context
-  {
-    KillGLWindow();
-    MessageBox(nullptr, "Can't Activate The GL Rendering Context.", "ERROR", MB_OK | MB_ICONEXCLAMATION);
-    return FALSE;
-  }
-
-  ShowWindow(hWnd, SW_SHOW);
-  SetForegroundWindow(hWnd);
-  SetFocus(hWnd);
-  ResizeScene(width, height);
-
-  return TRUE;
-}
-
-int32_t GetKey(int32_t key)
-{
-  if (key == 107 || key == 187) {
-    return ('+');
-  }
-  if (key == 109 || key == 189) {
-    return ('-');
-  }
-  if (key >= 'a' && key <= 'z') {
-    key += 'A' - 'a';
-  }
-
-  return (key);
-}
-
-LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  switch (uMsg) // Check For Windows Messages
-  {
-    case WM_ACTIVATE: // Watch For Window Activate Message, check minimization state
-      if (!HIWORD(wParam)) {
-        active = TRUE;
-      } else {
-        active = FALSE;
-      }
-      return 0;
-
-    case WM_SYSCOMMAND: // Intercept System Commands
-      switch (wParam)   // Check System Calls
-      {
-        case SC_SCREENSAVE:   // Screensaver Trying To Start?
-        case SC_MONITORPOWER: // Monitor Trying To Enter Powersave?
-          return 0;           // Prevent From Happening
-      }
-      break; // Exit
-
-    case WM_CLOSE: // Did We Receive A Close Message?
-      PostQuitMessage(0);
-      return 0;
-
-    case WM_KEYDOWN: // Is A Key Being Held Down?
-      wParam = GetKey(wParam);
-      mKeys[wParam] = TRUE;
-      mKeysShift[wParam] = mKeys[KEY_SHIFT];
-      HandleKey(wParam);
-      return 0;
-
-    case WM_KEYUP:
-      wParam = GetKey(wParam);
-      mKeysShift[wParam] = false;
-      mKeys[wParam] = false;
-      GPUInfo("Key: %d", wParam);
-      return 0;
-
-    case WM_SIZE:
-      ResizeScene(LOWORD(lParam), HIWORD(lParam)); // LoWord=Width, HiWord=Height
-      return 0;
-
-    case WM_LBUTTONDOWN:
-      mMouseDnX = GET_X_LPARAM(lParam);
-      mMouseDnY = GET_Y_LPARAM(lParam);
-      mMouseDn = true;
-      GetCursorPos(&mouseCursorPos);
-      return 0;
-
-    case WM_LBUTTONUP:
-      mMouseDn = false;
-      return 0;
-
-    case WM_RBUTTONDOWN:
-      mMouseDnX = GET_X_LPARAM(lParam);
-      mMouseDnY = GET_Y_LPARAM(lParam);
-      mMouseDnR = true;
-      GetCursorPos(&mouseCursorPos);
-      return 0;
-
-    case WM_RBUTTONUP:
-      mMouseDnR = false;
-      return 0;
-
-    case WM_MOUSEMOVE:
-      if (mouseReset) {
-        mMouseDnX = GET_X_LPARAM(lParam);
-        mMouseDnY = GET_Y_LPARAM(lParam);
-        mouseReset = 0;
-      }
-      mMouseMvX = GET_X_LPARAM(lParam);
-      mMouseMvY = GET_Y_LPARAM(lParam);
-      return 0;
-
-    case WM_MOUSEWHEEL:
-      mMouseWheel += GET_WHEEL_DELTA_WPARAM(wParam);
-      return 0;
-  }
-
-  // Pass All Unhandled Messages To DefWindowProc
-  return DefWindowProc(hWnd, uMsg, wParam, lParam);
-}
-
-GPUDisplayFrontendWindows::GPUDisplayFrontendWindows()
-{
-  mFrontendType = TYPE_WIN32;
-  mFrontendName = "Win32";
-}
-
-int32_t GPUDisplayFrontendWindows::FrontendMain()
-{
-  MSG msg;
-  BOOL done = FALSE;
-  fullscreen = FALSE;
-
-  if (glewInit()) {
-    return (-1);
-  }
-
-  if (!CreateGLWindow(DISPLAY_WINDOW_NAME, INIT_WIDTH, INIT_HEIGHT, 32, fullscreen)) {
-    return -1;
-  }
-
-  if (InitDisplay()) {
-    KillGLWindow();
-    GPUError("Initialization Failed.");
-    return 1;
-  }
-
-  while (!done) {
-    if (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) // Is There A Message Waiting?
-    {
-      if (msg.message == WM_QUIT) {
-        done = TRUE;
-      } else {
-        TranslateMessage(&msg); // Translate The Message
-        DispatchMessage(&msg);  // Dispatch The Message
-      }
-    } else {
-      if (active) // Program Active?
-      {
-        if (mKeys[VK_ESCAPE]) {
-          done = TRUE;
-        } else {
-          DrawGLScene();    // Draw The Scene
-          SwapBuffers(hDC); // Swap Buffers (Double Buffering)
-        }
-      }
-    }
-  }
-
-  // Shutdown
-  ExitDisplay();
-  KillGLWindow();
-  return (0);
-}
-
-void DisplayExit() {}
-void OpenGLPrint(const char* s, float x, float y, float r, float g, float b, float a, bool fromBotton) {}
-void SwitchFullscreen(bool set) {}
-void ToggleMaximized(bool set) {}
-void SetVSync(bool enable) {}
diff --git a/GPU/GPUTracking/utils/makefile_opencl_compiler.cxx b/GPU/GPUTracking/utils/makefile_opencl_compiler.cxx
deleted file mode 100644
index f6400cc3369e0..0000000000000
--- a/GPU/GPUTracking/utils/makefile_opencl_compiler.cxx
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file makefile_opencl_compiler.cxx
-/// \author David Rohr
-
-#define CL_TARGET_OPENCL_VERSION 220
-#define _CRT_SECURE_NO_WARNINGS
-#include "CL/opencl.h"
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-#include <string>
-#include <vector>
-
-#include "opencl_compiler_structs.h"
-
-#define quit(arg)              \
-  {                            \
-    fprintf(stderr, arg "\n"); \
-    return (1);                \
-  }
-#define DEFAULT_OPENCL_COMPILER_OPTIONS ""
-#define DEFAULT_OUTPUT_FILE "opencl.out"
-
-int32_t main(int argc, char** argv)
-{
-  const char* output_file = DEFAULT_OUTPUT_FILE;
-  std::string compiler_options = DEFAULT_OPENCL_COMPILER_OPTIONS;
-  std::vector<char*> files;
-
-  printf("Passing command line options:\n");
-  bool add_option = false;
-  for (int32_t i = 1; i < argc; i++) {
-    if (add_option) {
-      compiler_options += " ";
-      compiler_options += argv[i];
-    } else if (strcmp(argv[i], "--") == 0) {
-      add_option = true;
-    } else if (strcmp(argv[i], "-output-file") == 0) {
-      if (++i >= argc) {
-        quit("Output file name missing");
-      }
-      output_file = argv[i];
-    } else {
-      fprintf(stderr, "%s\n", argv[i]);
-      files.push_back(argv[i]);
-    }
-  }
-
-  cl_int ocl_error;
-  cl_uint num_platforms;
-  if (clGetPlatformIDs(0, nullptr, &num_platforms) != CL_SUCCESS) {
-    quit("Error getting OpenCL Platform Count");
-  }
-  if (num_platforms == 0) {
-    quit("No OpenCL Platform found");
-  }
-  printf("%d OpenCL Platforms found\n", num_platforms);
-
-  // Query platforms
-  cl_platform_id* platforms = new cl_platform_id[num_platforms];
-  if (platforms == nullptr) {
-    quit("Memory allocation error");
-  }
-  if (clGetPlatformIDs(num_platforms, platforms, nullptr) != CL_SUCCESS) {
-    quit("Error getting OpenCL Platforms");
-  }
-
-  cl_platform_id platform;
-  bool found = false;
-
-  _makefiles_opencl_platform_info pinfo;
-  for (uint32_t i_platform = 0; i_platform < num_platforms; i_platform++) {
-    clGetPlatformInfo(platforms[i_platform], CL_PLATFORM_PROFILE, 64, pinfo.platform_profile, nullptr);
-    clGetPlatformInfo(platforms[i_platform], CL_PLATFORM_VERSION, 64, pinfo.platform_version, nullptr);
-    clGetPlatformInfo(platforms[i_platform], CL_PLATFORM_NAME, 64, pinfo.platform_name, nullptr);
-    clGetPlatformInfo(platforms[i_platform], CL_PLATFORM_VENDOR, 64, pinfo.platform_vendor, nullptr);
-    printf("Available Platform %u: (%s %s) %s %s\n", i_platform, pinfo.platform_profile, pinfo.platform_version, pinfo.platform_vendor, pinfo.platform_name);
-    if (strcmp(pinfo.platform_vendor, "Advanced Micro Devices, Inc.") == 0 && strcmp(pinfo.platform_version, "OpenCL 2.0 AMD-APP (1800.8)") == 0) {
-      found = true;
-      printf("AMD OpenCL Platform found (%u)\n", i_platform);
-      platform = platforms[i_platform];
-      break;
-    }
-  }
-  if (found == false) {
-    quit("Did not find AMD OpenCL Platform");
-  }
-
-  if (clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 0, nullptr, &pinfo.count) != CL_SUCCESS) {
-    quit("Error getting OPENCL Device Count");
-  }
-
-  // Query devices
-  cl_device_id* devices = new cl_device_id[pinfo.count];
-  if (devices == nullptr) {
-    quit("Memory allocation error");
-  }
-  if (clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, pinfo.count, devices, nullptr) != CL_SUCCESS) {
-    quit("Error getting OpenCL devices");
-  }
-
-  _makefiles_opencl_device_info dinfo;
-  cl_device_type device_type;
-  cl_uint freq, shaders;
-
-  printf("Available OPENCL devices:\n");
-  for (uint32_t i = 0; i < pinfo.count; i++) {
-    printf("Examining device %u\n", i);
-
-    clGetDeviceInfo(devices[i], CL_DEVICE_NAME, 64, dinfo.device_name, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_VENDOR, 64, dinfo.device_vendor, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_TYPE, sizeof(cl_device_type), &device_type, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_MAX_CLOCK_FREQUENCY, sizeof(freq), &freq, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(shaders), &shaders, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_ADDRESS_BITS, sizeof(dinfo.nbits), &dinfo.nbits, nullptr);
-    printf("Found Device %u : %s %s (Frequency %d, Shaders %d, %d bit)\n", i, dinfo.device_vendor, dinfo.device_name, (int32_t)freq, (int32_t)shaders, (int32_t)dinfo.nbits);
-  }
-
-  if (files.size() == 0) {
-    quit("Syntax: opencl [-output-file OUTPUT_FILE] FILE1 [FILE2] ... [FILEn] [-- COMPILER_OPTION_1] [COMPILER_OPTION_2] ... [COMPILER_OPTION_N]");
-  }
-
-  char** buffers = (char**)malloc(files.size() * sizeof(char*));
-  if (buffers == nullptr) {
-    quit("Memory allocation error\n");
-  }
-  for (uint32_t i = 0; i < files.size(); i++) {
-    printf("Reading source file %s\n", files[i]);
-    FILE* fp = fopen(files[i], "rb");
-    if (fp == nullptr) {
-      printf("Cannot open %s\n", files[i]);
-      free(buffers);
-      return (1);
-    }
-    fseek(fp, 0, SEEK_END);
-    size_t file_size = ftell(fp);
-    fseek(fp, 0, SEEK_SET);
-
-    buffers[i] = (char*)malloc(file_size + 1);
-    if (buffers[i] == nullptr) {
-      quit("Memory allocation error");
-    }
-    if (fread(buffers[i], 1, file_size, fp) != file_size) {
-      quit("Error reading file");
-    }
-    buffers[i][file_size] = 0;
-    fclose(fp);
-  }
-
-  printf("Creating OpenCL Context\n");
-  // Create OpenCL context
-  cl_context context = clCreateContext(nullptr, pinfo.count, devices, nullptr, nullptr, &ocl_error);
-  if (ocl_error != CL_SUCCESS) {
-    quit("Error creating OpenCL context");
-  }
-
-  printf("Creating OpenCL Program Object\n");
-  // Create OpenCL program object
-  cl_program program = clCreateProgramWithSource(context, (cl_uint)files.size(), (const char**)buffers, nullptr, &ocl_error);
-  if (ocl_error != CL_SUCCESS) {
-    quit("Error creating program object");
-  }
-
-  printf("Compiling OpenCL Program\n");
-  // Compile program
-  ocl_error = clBuildProgram(program, pinfo.count, devices, compiler_options.c_str(), nullptr, nullptr);
-  if (ocl_error != CL_SUCCESS) {
-    fprintf(stderr, "OpenCL Error while building program: %d (Compiler options: %s)\n", ocl_error, compiler_options.c_str());
-    fprintf(stderr, "OpenCL Kernel:\n\n");
-    for (uint32_t i = 0; i < files.size(); i++) {
-      printf("%s\n\n", buffers[i]);
-    }
-
-    for (uint32_t i = 0; i < pinfo.count; i++) {
-      cl_build_status status;
-      clGetProgramBuildInfo(program, devices[i], CL_PROGRAM_BUILD_STATUS, sizeof(status), &status, nullptr);
-      if (status == CL_BUILD_ERROR) {
-        size_t log_size;
-        clGetProgramBuildInfo(program, devices[i], CL_PROGRAM_BUILD_LOG, 0, nullptr, &log_size);
-        char* build_log = (char*)malloc(log_size + 1);
-        if (build_log == nullptr) {
-          quit("Memory allocation error");
-        }
-        clGetProgramBuildInfo(program, devices[i], CL_PROGRAM_BUILD_LOG, log_size, build_log, nullptr);
-        fprintf(stderr, "Build Log (device %d):\n\n%s\n\n", i, build_log);
-        free(build_log);
-      }
-    }
-  }
-  for (uint32_t i = 0; i < files.size(); i++) {
-    free(buffers[i]);
-  }
-  free(buffers);
-  if (ocl_error != CL_SUCCESS) {
-    return (1);
-  }
-
-  printf("Obtaining program binaries\n");
-  size_t* binary_sizes = (size_t*)malloc(pinfo.count * sizeof(size_t));
-  if (binary_sizes == nullptr) {
-    quit("Memory allocation error");
-  }
-  clGetProgramInfo(program, CL_PROGRAM_BINARY_SIZES, pinfo.count * sizeof(size_t), binary_sizes, nullptr);
-  char** binary_buffers = (char**)malloc(pinfo.count * sizeof(char*));
-  if (binary_buffers == nullptr) {
-    quit("Memory allocation error");
-  }
-  for (uint32_t i = 0; i < pinfo.count; i++) {
-    printf("Binary size for device %d: %d\n", i, (int32_t)binary_sizes[i]);
-    binary_buffers[i] = (char*)malloc(binary_sizes[i]);
-    memset(binary_buffers[i], 0, binary_sizes[i]);
-    if (binary_buffers[i] == nullptr) {
-      quit("Memory allocation error");
-    }
-  }
-  clGetProgramInfo(program, CL_PROGRAM_BINARIES, pinfo.count * sizeof(char*), binary_buffers, nullptr);
-
-  printf("Programs obtained successfully, cleaning up opencl\n");
-  clReleaseProgram(program);
-  clReleaseContext(context);
-
-  printf("Writing binaries to file (%s)\n", output_file);
-  FILE* fp;
-  fp = fopen(output_file, "w+b");
-  if (fp == nullptr) {
-    quit("Error opening output file\n");
-  }
-  const char* magic_bytes = "QOCLPB";
-  fwrite(magic_bytes, 1, strlen(magic_bytes) + 1, fp);
-  fwrite(&pinfo, 1, sizeof(pinfo), fp);
-  for (uint32_t i = 0; i < pinfo.count; i++) {
-    clGetDeviceInfo(devices[i], CL_DEVICE_NAME, 64, dinfo.device_name, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_VENDOR, 64, dinfo.device_vendor, nullptr);
-    dinfo.binary_size = binary_sizes[i];
-    fwrite(&dinfo, 1, sizeof(dinfo), fp);
-    fwrite(binary_buffers[i], 1, binary_sizes[i], fp);
-  }
-  fclose(fp);
-
-  printf("All done, cleaning up remaining buffers\n");
-  for (uint32_t i = 0; i < pinfo.count; i++) {
-    free(binary_buffers[i]);
-  }
-  free(binary_sizes);
-  free(binary_buffers);
-
-  return (0);
-}
diff --git a/GPU/GPUTracking/utils/opencl_compiler_structs.h b/GPU/GPUTracking/utils/opencl_compiler_structs.h
deleted file mode 100644
index 68e0a4f184480..0000000000000
--- a/GPU/GPUTracking/utils/opencl_compiler_structs.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file opencl_compiler_structs.h
-/// \author David Rohr
-
-struct _makefiles_opencl_platform_info {
-  char platform_profile[64];
-  char platform_version[64];
-  char platform_name[64];
-  char platform_vendor[64];
-  cl_uint count;
-};
-
-struct _makefiles_opencl_device_info {
-  char device_name[64];
-  char device_vendor[64];
-  cl_uint nbits;
-  size_t binary_size;
-};
diff --git a/GPU/GPUTracking/utils/opencl_obtain_program.h b/GPU/GPUTracking/utils/opencl_obtain_program.h
deleted file mode 100644
index 6c10ca9d47de1..0000000000000
--- a/GPU/GPUTracking/utils/opencl_obtain_program.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file opencl_obtain_program.h
-/// \author David Rohr
-
-#ifndef MAKEFILES_OPENCL_OBTAIN_PROGRAMH
-#define MAKEFILES_OPENCL_OBTAIN_PROGRAMH
-
-#include <CL/opencl.h>
-#include <vector>
-#include "opencl_compiler_structs.h"
-
-static int32_t _makefiles_opencl_obtain_program_helper(cl_context context, cl_uint num_devices, cl_device_id* devices, cl_program* program, char* binaries)
-{
-  const char* magic_bytes = "QOCLPB";
-  if (strncmp(magic_bytes, binaries, strlen(magic_bytes)) != 0) {
-    printf("Internal error accessing opencl program\n");
-    return (1);
-  }
-  char* current_ptr = binaries + strlen(magic_bytes) + 1;
-  _makefiles_opencl_platform_info* pinfo = (_makefiles_opencl_platform_info*)current_ptr;
-  current_ptr += sizeof(_makefiles_opencl_platform_info);
-
-  if (num_devices != pinfo->count) {
-    printf("Number of devices differs from number of devices in opencl program\n");
-    return (1);
-  }
-  // printf("Obtaining program for OpenCL Platform: (%s %s) %s %s\n", pinfo->platform_profile, pinfo->platform_version, pinfo->platform_vendor, pinfo->platform_name);
-
-  std::vector<size_t> program_sizes(pinfo->count);
-  std::vector<char*> program_binaries(pinfo->count);
-
-  for (uint32_t i = 0; i < pinfo->count; i++) {
-    char device_name[64], device_vendor[64];
-    cl_uint nbits;
-    clGetDeviceInfo(devices[i], CL_DEVICE_NAME, 64, device_name, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_VENDOR, 64, device_vendor, nullptr);
-    clGetDeviceInfo(devices[i], CL_DEVICE_ADDRESS_BITS, sizeof(nbits), &nbits, nullptr);
-    _makefiles_opencl_device_info* dinfo = (_makefiles_opencl_device_info*)current_ptr;
-    if (strcmp(device_name, dinfo->device_name) != 0 || strcmp(device_vendor, dinfo->device_vendor) != 0) {
-      printf("Device list is different to device list from opencl program (Device %d: '%s - %s' != '%s - %s')\n", i, device_vendor, device_name, dinfo->device_vendor, dinfo->device_name);
-      return (1);
-    }
-    if (nbits != dinfo->nbits) {
-      printf("Pointer size of device and stored device binary differs\n");
-      return (1);
-    }
-    current_ptr += sizeof(_makefiles_opencl_device_info);
-    // printf("Device %d: %s %s (size %ld)\n", i, dinfo->device_vendor, dinfo->device_name, (int64_t) dinfo->binary_size);
-    program_sizes[i] = dinfo->binary_size;
-    program_binaries[i] = current_ptr;
-    current_ptr += dinfo->binary_size;
-  }
-
-  cl_int return_status[pinfo->count];
-  cl_int ocl_error;
-  *program = clCreateProgramWithBinary(context, num_devices, devices, program_sizes.data(), (const uint8_t**)program_binaries.data(), return_status, &ocl_error);
-
-  if (ocl_error != CL_SUCCESS) {
-    printf("Error loading program\n");
-    return (1);
-  }
-
-  for (uint32_t i = 0; i < pinfo->count; i++) {
-    if (return_status[i] != CL_SUCCESS) {
-      printf("Error loading program for device %d\n", i);
-      clReleaseProgram(*program);
-      return (1);
-    }
-  }
-
-  ocl_error = clBuildProgram(*program, num_devices, devices, "", nullptr, nullptr);
-  if (ocl_error != CL_SUCCESS) {
-    printf("Error building program\n");
-    clReleaseProgram(*program);
-    return (1);
-  }
-
-  return (0);
-}
-
-#endif
diff --git a/GPU/GPUTracking/utils/threadserver.cxx b/GPU/GPUTracking/utils/threadserver.cxx
deleted file mode 100644
index cedd7af6fa428..0000000000000
--- a/GPU/GPUTracking/utils/threadserver.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file threadserver.cxx
-/// \author David Rohr
-
-#include <cstdio>
-
-#ifndef STD_OUT
-#define STD_OUT stdout
-#endif
-
-#include "threadserver.h"
diff --git a/GPU/GPUTracking/utils/threadserver.h b/GPU/GPUTracking/utils/threadserver.h
deleted file mode 100644
index c8dfe831fd578..0000000000000
--- a/GPU/GPUTracking/utils/threadserver.h
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file threadserver.h
-/// \author David Rohr
-
-#ifndef THREADSERVER_H
-#define THREADSERVER_H
-
-#ifdef _WIN32
-#include "pthread_mutex_win32_wrapper.h"
-#include "sched_affinity_win32_wrapper.h"
-#else
-#include <pthread.h>
-#include <sched.h>
-#endif
-#include "qsem.h"
-
-class qThreadServerException
-{
-};
-
-template <class S, class T>
-class qThreadCls;
-
-class qThreadParam
-{
-  template <class S, class T>
-  friend class qThreadCls;
-
- public:
-  qThreadParam()
-  {
-    for (int32_t i = 0; i < 2; i++) {
-      threadMutex[i].Lock();
-    }
-    terminate = false;
-    pinCPU = -1;
-  }
-
-  ~qThreadParam()
-  {
-    for (int32_t i = 0; i < 2; i++) {
-      threadMutex[i].Unlock();
-    }
-  }
-
-  bool WaitForTask()
-  {
-    threadMutex[1].Unlock();
-    threadMutex[0].Lock();
-    return (!terminate);
-  }
-
-  int32_t threadNum;
-
- protected:
-  int32_t pinCPU;
-  qSem threadMutex[2];
-  volatile bool terminate;
-};
-
-template <class S>
-class qThreadParamCls : public qThreadParam
-{
-  template <class SS, class TT>
-  friend class qThreadCls;
-
- private:
-  S* pCls;
-  void (S::*pFunc)(void*);
-};
-
-template <class S, class T>
-static void* qThreadWrapperCls(void* arg);
-
-template <class S, class T>
-class qThreadCls
-{
- public:
-  qThreadCls() { started = false; };
-  qThreadCls(S* pCls, void (S::*pFunc)(T*), int32_t threadNum = 0, int32_t pinCPU = -1) : threadParam()
-  {
-    started = false;
-    SpawnThread(pCls, pFunc, threadNum, pinCPU);
-  }
-
-  void SpawnThread(S* pCls, void (S::*pFunc)(T*), int32_t threadNum = 0, int32_t pinCPU = -1, bool wait = true)
-  {
-    qThreadParamCls<S>& XthreadParam = *((qThreadParamCls<S>*)&this->threadParam);
-
-    XthreadParam.pCls = pCls;
-    XthreadParam.pFunc = (void(S::*)(void*))pFunc;
-    XthreadParam.threadNum = threadNum;
-    XthreadParam.pinCPU = pinCPU;
-    pthread_t thr;
-    pthread_create(&thr, nullptr, (void* (*)(void*)) & qThreadWrapperCls, &XthreadParam);
-    if (wait) {
-      WaitForSpawn();
-    }
-    started = true;
-  }
-
-  void WaitForSpawn() { threadParam.threadMutex[1].Lock(); }
-
-  ~qThreadCls()
-  {
-    if (started) {
-      End();
-    }
-  }
-
-  void End()
-  {
-    qThreadParamCls<S>& XthreadParam = *((qThreadParamCls<S>*)&this->threadParam);
-
-    XthreadParam.terminate = true;
-    XthreadParam.threadMutex[0].Unlock();
-    XthreadParam.threadMutex[1].Lock();
-    started = false;
-  }
-
-  void Start() { threadParam.threadMutex[0].Unlock(); }
-
-  void Sync() { threadParam.threadMutex[1].Lock(); }
-
- private:
-  bool started;
-  T threadParam;
-
-  static void* qThreadWrapperCls(T* arg);
-};
-
-template <class S, class T>
-void* qThreadCls<S, T>::qThreadWrapperCls(T* arg)
-{
-  qThreadParamCls<S>* const arg_A = (qThreadParamCls<S>*)arg;
-  if (arg_A->pinCPU != -1) {
-    cpu_set_t tmp_mask;
-    CPU_ZERO(&tmp_mask);
-    CPU_SET(arg_A->pinCPU, &tmp_mask);
-    sched_setaffinity(0, sizeof(tmp_mask), &tmp_mask);
-  }
-
-  void (S::*pFunc)(T*) = (void(S::*)(T*))arg_A->pFunc;
-  (arg_A->pCls->*pFunc)(arg);
-
-  arg_A->threadMutex[1].Unlock();
-  pthread_exit(nullptr);
-  return (nullptr);
-}
-
-template <class S, class T>
-class qThreadClsArray
-{
- public:
-  qThreadClsArray()
-  {
-    pArray = nullptr;
-    nThreadsRunning = 0;
-  }
-  qThreadClsArray(int32_t n, S* pCls, void (S::*pFunc)(T*), int32_t threadNumOffset = 0, int32_t* pinCPU = nullptr)
-  {
-    pArray = nullptr;
-    nThreadsRunning = 0;
-    SetNumberOfThreads(n, pCls, pFunc, threadNumOffset, pinCPU);
-  }
-
-  void SetNumberOfThreads(int32_t n, S* pCls, void (S::*pFunc)(T*), int32_t threadNumOffset = 0, int32_t* pinCPU = nullptr)
-  {
-    if (nThreadsRunning) {
-      fprintf(STD_OUT, "Threads already started\n");
-      throw(qThreadServerException());
-    }
-    pArray = new qThreadCls<S, T>[n];
-    nThreadsRunning = n;
-    for (int32_t i = 0; i < n; i++) {
-      pArray[i].SpawnThread(pCls, pFunc, threadNumOffset + i, pinCPU == nullptr ? -1 : pinCPU[i], false);
-    }
-    for (int32_t i = 0; i < n; i++) {
-      pArray[i].WaitForSpawn();
-    }
-  }
-
-  ~qThreadClsArray()
-  {
-    if (nThreadsRunning) {
-      EndThreads();
-    }
-  }
-
-  void EndThreads()
-  {
-    delete[] pArray;
-    nThreadsRunning = 0;
-  }
-
-  void Start()
-  {
-    for (int32_t i = 0; i < nThreadsRunning; i++) {
-      pArray[i].Start();
-    }
-  }
-
-  void Sync()
-  {
-    for (int32_t i = 0; i < nThreadsRunning; i++) {
-      pArray[i].Sync();
-    }
-  }
-
- private:
-  qThreadCls<S, T>* pArray;
-  int32_t nThreadsRunning;
-};
-
-#endif
diff --git a/GPU/GPUbenchmark/Shared/Utils.h b/GPU/GPUbenchmark/Shared/Utils.h
deleted file mode 100644
index fc3345a704b65..0000000000000
--- a/GPU/GPUbenchmark/Shared/Utils.h
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-///
-/// \file Common.h
-/// \author: mconcas@cern.ch
-
-#ifndef GPU_BENCHMARK_UTILS_H
-#define GPU_BENCHMARK_UTILS_H
-
-#if defined(__HIPCC__)
-#include "hip/hip_runtime.h"
-#endif
-
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include <typeinfo>
-#include <boost/program_options.hpp>
-#include <vector>
-#include <string>
-#include <cmath>
-
-#define KNRM "\x1B[0m"
-#define KRED "\x1B[31m"
-#define KGRN "\x1B[32m"
-#define KYEL "\x1B[33m"
-#define configLU "\x1B[34m"
-#define KMAG "\x1B[35m"
-#define KCYN "\x1B[36m"
-#define KWHT "\x1B[37m"
-
-#define GB (1024 * 1024 * 1024)
-
-#define failed(...)                       \
-  printf("%serror: ", KRED);              \
-  printf(__VA_ARGS__);                    \
-  printf("\n");                           \
-  printf("error: TEST FAILED\n%s", KNRM); \
-  exit(EXIT_FAILURE);
-#endif
-
-template <typename T>
-void discardResult(const T&)
-{
-}
-
-enum class Test {
-  Read,
-  Write,
-  Copy,
-  RandomRead,
-  RandomWrite,
-  RandomCopy
-};
-
-inline std::ostream& operator<<(std::ostream& os, Test test)
-{
-  switch (test) {
-    case Test::Read:
-      os << "read";
-      break;
-    case Test::Write:
-      os << "write";
-      break;
-    case Test::Copy:
-      os << "copy";
-      break;
-    case Test::RandomRead:
-      os << "random read";
-      break;
-    case Test::RandomWrite:
-      os << "random write";
-      break;
-    case Test::RandomCopy:
-      os << "random copy";
-      break;
-  }
-  return os;
-}
-
-enum class Mode {
-  Sequential,
-  Concurrent,
-  Distributed
-};
-
-inline std::ostream& operator<<(std::ostream& os, Mode mode)
-{
-  switch (mode) {
-    case Mode::Sequential:
-      os << "sequential";
-      break;
-    case Mode::Concurrent:
-      os << "concurrent";
-      break;
-    case Mode::Distributed:
-      os << "distributed";
-      break;
-  }
-  return os;
-}
-
-enum class KernelConfig {
-  Single,
-  Multi,
-  All,
-  Manual
-};
-
-inline std::ostream& operator<<(std::ostream& os, KernelConfig config)
-{
-  switch (config) {
-    case KernelConfig::Single:
-      os << "single";
-      break;
-    case KernelConfig::Multi:
-      os << "multiple";
-      break;
-    case KernelConfig::All:
-      os << "all";
-      break;
-    case KernelConfig::Manual:
-      os << "manual";
-      break;
-  }
-  return os;
-}
-
-template <class T>
-inline std::string getType()
-{
-  if (typeid(T).name() == typeid(int8_t).name()) {
-    return std::string{"int8_t"};
-  }
-  if (typeid(T).name() == typeid(size_t).name()) {
-    return std::string{"uint64_t"};
-  }
-  if (typeid(T).name() == typeid(int32_t).name()) {
-    return std::string{"int32_t"};
-  }
-  if (typeid(T).name() == typeid(int4).name()) {
-    return std::string{"int4"};
-  }
-  return std::string{"unknown"};
-}
-
-inline std::string getTestName(Mode mode, Test test, KernelConfig blocks)
-{
-  std::string tname;
-  tname += (mode == Mode::Sequential) ? "seq_" : "conc_";
-  tname += (test == Test::Read) ? "read_" : (test == Test::Write) ? "write_"
-                                                                  : "copy_";
-  tname += (blocks == KernelConfig::Single) ? "SB" : "MB";
-  return tname;
-}
-
-// Return pointer to custom offset (GB)
-template <class chunk_t>
-inline chunk_t* getCustomPtr(chunk_t* scratchPtr, float startGB)
-{
-  return reinterpret_cast<chunk_t*>(reinterpret_cast<char*>(scratchPtr) + (static_cast<size_t>(GB * startGB) & 0xFFFFFFFFFFFFF000));
-}
-
-inline float computeThroughput(Test test, float result, float chunkSizeGB, int32_t ntests)
-{
-  // https://docs.nvidia.com/cuda/cuda-c-best-practices-guide/index.html
-  // Eff_bandwidth (GB/s) = (B_r + B_w) / (~1e9 * Time (s))
-
-  return 1e3 * chunkSizeGB * (float)ntests / result;
-}
-
-template <class chunk_t>
-inline size_t getBufferCapacity(float chunkSizeGB, int32_t prime)
-{
-  auto chunkCapacity = (static_cast<size_t>(GB * chunkSizeGB) & 0xFFFFFFFFFFFFF000) / sizeof(chunk_t);
-  if (!prime) {
-    return chunkCapacity;
-  } else {
-    return (chunkCapacity % prime == 0) ? (chunkCapacity - 0x1000) : chunkCapacity;
-  }
-}
-
-inline bool is_prime(const int32_t n)
-{
-  bool isPrime = true;
-  if (n == 0 || n == 1) {
-    isPrime = false;
-  } else {
-    for (int32_t i = 2; i <= sqrt(n); ++i) {
-      if (n % i == 0) {
-        isPrime = false;
-        break;
-      }
-    }
-  }
-
-  return isPrime;
-}
-
-namespace o2
-{
-namespace benchmark
-{
-struct benchmarkOpts {
-  benchmarkOpts() = default;
-
-  int32_t deviceId = 0;
-  std::vector<Test> tests = {Test::Read, Test::Write, Test::Copy};
-  std::vector<Mode> modes = {Mode::Sequential, Mode::Concurrent};
-  std::vector<KernelConfig> pools = {KernelConfig::Single, KernelConfig::Multi};
-  std::vector<std::string> dtypes = {"int8_t", "int32_t", "uint64_t"};
-  std::vector<std::pair<float, float>> testChunks;
-  float chunkReservedGB = 1.f;
-  float threadPoolFraction = 1.f;
-  float freeMemoryFractionToAllocate = 0.95f;
-  int32_t numThreads = -1;
-  int32_t numBlocks = -1;
-  int32_t kernelLaunches = 1;
-  int32_t nTests = 1;
-  bool raw = false;
-  int32_t streams = 8;
-  int32_t prime = 0;
-  std::string outFileName = "benchmark_result";
-  bool dumpChunks = false;
-};
-
-template <class chunk_t>
-struct gpuState {
-  int32_t getMaxChunks()
-  {
-    return (double)scratchSize / (chunkReservedGB * GB);
-  }
-
-  int32_t getNKernelLaunches() { return iterations; }
-  int32_t getStreamsPoolSize() { return streams; }
-
-  // Configuration
-  size_t nMaxThreadsPerDimension;
-  int32_t iterations;
-  int32_t streams;
-
-  float chunkReservedGB; // Size of each partition (GB)
-
-  // General containers and state
-  chunk_t* scratchPtr;                             // Pointer to scratch buffer
-  size_t scratchSize;                              // Size of scratch area (B)
-  std::vector<chunk_t*> partAddrOnHost;            // Pointers to scratch partitions on host vector
-  std::vector<std::pair<float, float>> testChunks; // Vector of definitions for arbitrary chunks
-
-  // Static info
-  size_t totalMemory;
-  size_t nMultiprocessors;
-  size_t nMaxThreadsPerBlock;
-};
-
-} // namespace benchmark
-} // namespace o2
\ No newline at end of file
diff --git a/GPU/TPCFastTransformation/TPCFastTransformManager.cxx b/GPU/TPCFastTransformation/TPCFastTransformManager.cxx
deleted file mode 100644
index 7d0aa29545578..0000000000000
--- a/GPU/TPCFastTransformation/TPCFastTransformManager.cxx
+++ /dev/null
@@ -1,335 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file  TPCFastTransformManager.cxx
-/// \brief Implementation of TPCFastTransformManager class
-///
-/// \author  Sergey Gorbunov <sergey.gorbunov@cern.ch>
-
-#include "TPCFastTransformManager.h"
-#include "AliHLTTPCGeometry.h"
-#include "AliTPCParam.h"
-#include "AliTPCRecoParam.h"
-#include "AliTPCTransform.h"
-#include "AliTPCcalibDB.h"
-#include "TPCFastTransform.h"
-#include "Spline2DHelper.h"
-
-using namespace o2::gpu;
-
-TPCFastTransformManager::TPCFastTransformManager()
-  : mError(), mOrigTransform(nullptr), fLastTimeBin(0) {}
-
-int32_t TPCFastTransformManager::create(TPCFastTransform& fastTransform,
-                                        AliTPCTransform* transform,
-                                        long TimeStamp)
-{
-  /// Initializes TPCFastTransform object
-
-  AliTPCcalibDB* pCalib = AliTPCcalibDB::Instance();
-  if (!pCalib) {
-    return storeError(
-      -1, "TPCFastTransformManager::Init: No TPC calibration instance found");
-  }
-
-  AliTPCParam* tpcParam = pCalib->GetParameters();
-  if (!tpcParam) {
-    return storeError(
-      -2, "TPCFastTransformManager::Init: No TPCParam object found");
-  }
-
-  if (!transform) {
-    transform = pCalib->GetTransform();
-  }
-  if (!transform) {
-    return storeError(
-      -3, "TPCFastTransformManager::Init: No TPC transformation found");
-  }
-
-  mOrigTransform = transform;
-
-  tpcParam->Update();
-  tpcParam->ReadGeoMatrices();
-
-  const AliTPCRecoParam* rec = transform->GetCurrentRecoParam();
-  if (!rec) {
-    return storeError(-5,
-                      "TPCFastTransformManager::Init: No TPC Reco Param "
-                      "set in transformation");
-  }
-
-  bool useCorrectionMap = rec->GetUseCorrectionMap();
-
-  if (useCorrectionMap) {
-    transform->SetCorrectionMapMode(kTRUE); // If the simulation set this to
-                                            // false to simulate corrections, we
-                                            // need to reverse it for the
-                                            // transformation
-  }
-  // find last calibrated time bin
-
-  fLastTimeBin = rec->GetLastBin();
-
-  const int32_t nRows = tpcParam->GetNRowLow() + tpcParam->GetNRowUp();
-
-  TPCFastTransformGeo geo;
-
-  { // construct the geometry
-    geo.startConstruction(nRows);
-
-    float tpcZlengthSideA = tpcParam->GetZLength(0);
-    float tpcZlengthSideC =
-      tpcParam->GetZLength(TPCFastTransformGeo::getNumberOfSlices() / 2);
-
-    geo.setTPCzLength(tpcZlengthSideA, tpcZlengthSideC);
-    geo.setTPCalignmentZ(-mOrigTransform->GetDeltaZCorrTime());
-
-    for (int32_t row = 0; row < geo.getNumberOfRows(); row++) {
-      int32_t slice = 0, sector = 0, secrow = 0;
-      AliHLTTPCGeometry::Slice2Sector(slice, row, sector, secrow);
-      Int_t nPads = tpcParam->GetNPads(sector, secrow);
-      float xRow = tpcParam->GetPadRowRadii(sector, secrow);
-      float padWidth = tpcParam->GetInnerPadPitchWidth();
-      if (row >= tpcParam->GetNRowLow()) {
-        padWidth = tpcParam->GetOuterPadPitchWidth();
-      }
-      geo.setTPCrow(row, xRow, nPads, padWidth);
-    }
-    geo.finishConstruction();
-  }
-
-  TPCFastSpaceChargeCorrection correction;
-
-  { // create the correction map
-
-    const int32_t nDistortionScenarios = 1;
-
-    correction.startConstruction(geo, nDistortionScenarios);
-
-    TPCFastSpaceChargeCorrection::SplineType spline;
-    spline.recreate(8, 20);
-
-    int32_t scenario = 0;
-    correction.setSplineScenario(scenario, spline);
-
-    for (int32_t row = 0; row < geo.getNumberOfRows(); row++) {
-      correction.setRowScenarioID(row, scenario);
-    }
-
-    correction.finishConstruction();
-  } // .. create the correction map
-
-  { // create the fast transform object
-
-    fastTransform.startConstruction(correction);
-
-    // tell the transformation to apply the space charge corrections
-    fastTransform.setApplyCorrectionOn();
-
-    // set some initial calibration values, will be reinitialised later int32_t
-    // updateCalibration()
-    const float t0 = 0.;
-    const float vDrift = 0.f;
-    const float vdCorrY = 0.;
-    const float ldCorr = 0.;
-    const float tofCorr = 0.;
-    const float primVtxZ = 0.;
-    const int64_t initTimeStamp = -1;
-    fastTransform.setCalibration(initTimeStamp, t0, vDrift, vdCorrY, ldCorr,
-                                 tofCorr, primVtxZ);
-
-    fastTransform.finishConstruction();
-  }
-
-  return updateCalibration(fastTransform, TimeStamp);
-}
-
-int32_t TPCFastTransformManager::updateCalibration(TPCFastTransform& fastTransform,
-                                                   long TimeStamp)
-{
-  // Update the calibration with the new time stamp
-
-  long lastTS = fastTransform.getTimeStamp();
-
-  // deinitialize
-
-  fastTransform.setTimeStamp(-1);
-
-  if (TimeStamp < 0) {
-    return 0;
-  }
-
-  // search for the calibration database
-
-  if (!mOrigTransform) {
-    return storeError(-1,
-                      "TPCFastTransformManager::SetCurrentTimeStamp: TPC "
-                      "transformation has not been set properly");
-  }
-
-  AliTPCcalibDB* pCalib = AliTPCcalibDB::Instance();
-  if (!pCalib) {
-    return storeError(-2,
-                      "TPCFastTransformManager::SetCurrentTimeStamp: No "
-                      "TPC calibration found");
-  }
-
-  AliTPCParam* tpcParam = pCalib->GetParameters();
-  if (!tpcParam) {
-    return storeError(-3,
-                      "TPCFastTransformManager::SetCurrentTimeStamp: No "
-                      "TPCParam object found");
-  }
-
-  AliTPCRecoParam* recoParam = mOrigTransform->GetCurrentRecoParamNonConst();
-  if (!recoParam) {
-    return storeError(-5,
-                      "TPCFastTransformManager::Init: No TPC Reco Param "
-                      "set in transformation");
-  }
-
-  // calibration found, set the initialized status back
-
-  fastTransform.setTimeStamp(lastTS);
-
-  // less than 60 seconds from the previois time stamp, don't do anything
-
-  if (lastTS >= 0 && TMath::Abs(lastTS - TimeStamp) < 60) {
-    return 0;
-  }
-
-  // start the initialization
-
-  bool useCorrectionMap = recoParam->GetUseCorrectionMap();
-
-  if (useCorrectionMap) {
-    // If the simulation set this to false to simulate corrections, we need to
-    // reverse it for the transformation This is a design feature. Historically
-    // HLT code runs as a part of simulation, not reconstruction.
-    mOrigTransform->SetCorrectionMapMode(kTRUE);
-  }
-
-  // set the current time stamp
-
-  mOrigTransform->SetCurrentTimeStamp(static_cast<uint32_t>(TimeStamp));
-  fastTransform.setTimeStamp(TimeStamp);
-
-  // find last calibrated time bin
-
-  fLastTimeBin = recoParam->GetLastBin();
-
-  double t0 = mOrigTransform->GetTBinOffset();
-  double driftCorrPT = mOrigTransform->GetDriftCorrPT();
-  double vdCorrectionTime = mOrigTransform->GetVDCorrectionTime();
-  double vdCorrectionTimeGY = mOrigTransform->GetVDCorrectionTimeGY();
-  double time0CorrTime = mOrigTransform->GetTime0CorrTime();
-
-  // original formula:
-  // L = (t-t0)*ZWidth*driftCorrPT*vdCorrectionTime*( 1 +
-  // yLab*vdCorrectionTimeGY )  -  time0CorrTime + 3.*tpcParam->GetZSigma(); Z =
-  // Z(L) - fDeltaZCorrTime chebyshev corrections for xyz Time-of-flight
-  // correction: ldrift += dist-to-vtx*tofCorr
-
-  // fast transform formula:
-  // L = (t-t0)*(mVdrift + mVdriftCorrY*yLab ) + mLdriftCorr
-  // Z = Z(L) +  tpcAlignmentZ
-  // spline corrections for xyz
-  // Time-of-flight correction: ldrift += dist-to-vtx*tofCorr
-
-  double vDrift = tpcParam->GetZWidth() * driftCorrPT * vdCorrectionTime;
-  double vdCorrY = vDrift * vdCorrectionTimeGY;
-  double ldCorr = -time0CorrTime + 3 * tpcParam->GetZSigma();
-
-  double tofCorr = (0.01 * tpcParam->GetDriftV()) / TMath::C();
-  double primVtxZ = mOrigTransform->GetPrimVertex()[2];
-
-  bool useTOFcorrection = recoParam->GetUseTOFCorrection();
-
-  if (!useTOFcorrection) {
-    tofCorr = 0;
-  }
-
-  fastTransform.setCalibration(TimeStamp, t0, vDrift, vdCorrY, ldCorr, tofCorr,
-                               primVtxZ);
-
-  // now calculate the correction map: dx,du,dv = ( origTransform() -> x,u,v) -
-  // fastTransformNominal:x,u,v
-
-  const TPCFastTransformGeo& geo = fastTransform.getGeometry();
-
-  TPCFastSpaceChargeCorrection& correction =
-    fastTransform.getCorrection();
-
-  // switch TOF correction off for a while
-
-  recoParam->SetUseTOFCorrection(kFALSE);
-
-  for (int32_t slice = 0; slice < geo.getNumberOfSlices(); slice++) {
-
-    for (int32_t row = 0; row < geo.getNumberOfRows(); row++) {
-
-      const TPCFastTransformGeo::RowInfo& rowInfo = geo.getRowInfo(row);
-
-      const TPCFastSpaceChargeCorrection::SplineType& spline = correction.getSpline(slice, row);
-      float* data = correction.getSplineData(slice, row);
-
-      Spline2DHelper<float> helper;
-      helper.setSpline(spline, 4, 4);
-      auto F = [&](double su, double sv, double dxuv[3]) {
-        float x = rowInfo.x;
-        // x, u, v cordinates of the knot (local cartesian coord. of slice
-        // towards central electrode )
-        float u = 0, v = 0;
-        geo.convScaledUVtoUV(slice, row, su, sv, u, v);
-
-        // row, pad, time coordinates of the knot
-        float vertexTime = 0.f;
-        float pad = 0.f, time = 0.f;
-        fastTransform.convUVtoPadTime(slice, row, u, v, pad, time, vertexTime);
-
-        // nominal x,y,z coordinates of the knot (without corrections and
-        // time-of-flight correction)
-        float y = 0, z = 0;
-        geo.convUVtoLocal(slice, u, v, y, z);
-
-        // original TPC transformation (row,pad,time) -> (x,y,z) without
-        // time-of-flight correction
-        float ox = 0, oy = 0, oz = 0;
-        {
-          int32_t sector = 0, secrow = 0;
-          AliHLTTPCGeometry::Slice2Sector(slice, row, sector, secrow);
-          int32_t is[] = {sector};
-          double xx[] = {static_cast<double>(secrow), pad, time};
-          mOrigTransform->Transform(xx, is, 0, 1);
-          ox = xx[0];
-          oy = xx[1];
-          oz = xx[2];
-        }
-        // convert to u,v
-        float ou = 0, ov = 0;
-        geo.convLocalToUV(slice, oy, oz, ou, ov);
-
-        // corrections in x,u,v:
-        dxuv[0] = ox - x;
-        dxuv[1] = ou - u;
-        dxuv[2] = ov - v;
-      };
-
-      helper.approximateFunction(data, 0., 1., 0., 1., F);
-    } // row
-  } // slice
-
-  // set back the time-of-flight correction;
-
-  recoParam->SetUseTOFCorrection(useTOFcorrection);
-
-  return 0;
-}
diff --git a/GPU/TPCFastTransformation/TPCFastTransformQA.cxx b/GPU/TPCFastTransformation/TPCFastTransformQA.cxx
deleted file mode 100644
index 8616311038952..0000000000000
--- a/GPU/TPCFastTransformation/TPCFastTransformQA.cxx
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file  TPCFastTransformQA.cxx
-/// \brief Implementation of TPCFastTransformQA class
-///
-/// \author  Sergey Gorbunov <sergey.gorbunov@cern.ch>
-
-#include "TPCFastTransformQA.h"
-#include "TPCFastTransformManager.h"
-#include "TPCFastTransform.h"
-#include "GPUCommonLogger.h"
-
-#include "AliTPCTransform.h"
-#include "AliTPCParam.h"
-#include "AliTPCRecoParam.h"
-#include "AliTPCcalibDB.h"
-#include "AliHLTTPCGeometry.h"
-#include "TFile.h"
-#include "TNtuple.h"
-#include "TStopwatch.h"
-
-#include <iostream>
-#include <iomanip>
-
-using namespace o2::gpu;
-using namespace std;
-
-TPCFastTransformQA::TPCFastTransformQA() {}
-
-int32_t TPCFastTransformQA::doQA(const TPCFastTransform& fastTransform)
-{
-  const char* fileName = "fastTransformQA.root";
-
-  AliTPCcalibDB* pCalib = AliTPCcalibDB::Instance();
-  if (!pCalib) {
-    return storeError(-1, "TPCFastTransformQA: No TPC calibration instance found");
-  }
-
-  AliTPCParam* tpcParam = pCalib->GetParameters();
-  if (!tpcParam) {
-    return storeError(-2, "TPCFastTransformQA: No TPCParam object found");
-  }
-
-  AliTPCTransform* origTransform = pCalib->GetTransform();
-  if (!origTransform) {
-    return storeError(-3, "TPCFastTransformQA: No TPC transformation found");
-  }
-
-  const AliTPCRecoParam* rec = origTransform->GetCurrentRecoParam();
-  if (!rec) {
-    return storeError(-5, "TPCFastTransformQA: No TPC Reco Param set in transformation");
-  }
-  rec->Print();
-
-  int32_t lastTimeBin = rec->GetLastBin();
-
-  // measure execution time
-  {
-    TStopwatch timer1;
-    double nCalls1 = 0;
-    double sum1 = 0;
-    for (Int_t iSec = 0; iSec < 1; iSec++) {
-      LOG(info) << "Measure original transformation time for TPC sector " << iSec << " ..";
-      int32_t nRows = tpcParam->GetNRow(iSec);
-      for (int32_t iRow = 0; iRow < nRows; iRow++) {
-        Int_t nPads = tpcParam->GetNPads(iSec, iRow);
-        for (float pad = 0.5; pad < nPads; pad += 1.) {
-          for (float time = 0; time < lastTimeBin; time++) {
-            Int_t is[] = {iSec};
-            double orig[3] = {static_cast<Double_t>(iRow), pad, time};
-            origTransform->Transform(orig, is, 0, 1);
-            nCalls1++;
-            sum1 += orig[0] + orig[1] + orig[2];
-          }
-        }
-      }
-    }
-    timer1.Stop();
-
-    TStopwatch timer2;
-    double nCalls2 = 0;
-    double sum2 = 0;
-    for (Int_t iSec = 0; iSec < 1; iSec++) {
-      LOG(info) << "Measure fast transformation time for TPC sector " << iSec << " ..";
-      int32_t nRows = tpcParam->GetNRow(iSec);
-      for (int32_t iRow = 0; iRow < nRows; iRow++) {
-        Int_t nPads = tpcParam->GetNPads(iSec, iRow);
-        int32_t slice = 0, slicerow = 0;
-        AliHLTTPCGeometry::Sector2Slice(slice, slicerow, iSec, iRow);
-        for (float pad = 0.5; pad < nPads; pad += 1.) {
-          for (float time = 0; time < lastTimeBin; time++) {
-            float fast[3];
-            fastTransform.Transform(slice, slicerow, pad, time, fast[0], fast[1], fast[2]);
-            nCalls2++;
-            sum2 += fast[0] + fast[1] + fast[2];
-          }
-        }
-      }
-    }
-    timer2.Stop();
-    LOG(info) << "nCalls1 = " << nCalls1;
-    LOG(info) << "nCalls2 = " << nCalls2;
-    LOG(info) << "Orig transformation    : " << timer1.RealTime() * 1.e9 / nCalls1 << " ns / call";
-    LOG(info) << "Fast transformation    : " << timer2.RealTime() * 1.e9 / nCalls2 << " ns / call";
-
-    LOG(info) << "Fast Transformation speedup: " << 1. * timer1.RealTime() / timer2.RealTime() * nCalls2 / nCalls1;
-
-    int32_t size = sizeof(fastTransform) + fastTransform.getFlatBufferSize();
-    LOG(info) << "Fast Transformation memory usage: " << size / 1000. / 1000. << " MB";
-    LOG(info) << "ignore this " << sum1 << " " << sum2;
-  }
-
-  if (1) {
-    TFile* file = new TFile(fileName, "RECREATE");
-    if (!file || !file->IsOpen()) {
-      return storeError(-1, "Can't recreate QA file !");
-    }
-    file->cd();
-    TNtuple* nt = new TNtuple("fastTransformQA", "fastTransformQA", "sec:row:pad:time:x:y:z:fx:fy:fz");
-
-    for (Int_t iSec = 0; iSec < 1; iSec++) {
-      int32_t nRows = tpcParam->GetNRow(iSec);
-      for (int32_t iRow = 0; iRow < nRows; iRow++) {
-        LOG(info) << "Write fastTransform QA for TPC sector " << iSec << ", row " << iRow << " ..";
-        Int_t nPads = tpcParam->GetNPads(iSec, iRow);
-        int32_t slice = 0, slicerow = 0;
-        AliHLTTPCGeometry::Sector2Slice(slice, slicerow, iSec, iRow);
-        for (float pad = 0.5; pad < nPads; pad += 1.) {
-          for (float time = 0; time < lastTimeBin; time++) {
-            Int_t is[] = {iSec};
-            double orig[3] = {static_cast<Double_t>(iRow), pad, time};
-            float fast[3];
-            origTransform->Transform(orig, is, 0, 1);
-            fastTransform.Transform(slice, slicerow, pad, time, fast[0], fast[1], fast[2]);
-            float entry[] = {(float)iSec, (float)iRow, pad, time, (float)orig[0], (float)orig[1], (float)orig[2], fast[0], fast[1], fast[2]};
-            nt->Fill(entry);
-          }
-        }
-      }
-    }
-    file->Write();
-    file->Close();
-    delete file;
-  }
-  return 0;
-}
-
-int32_t TPCFastTransformQA::doQA(long TimeStamp)
-{
-  TPCFastTransform fastTransform;
-  TPCFastTransformManager man;
-
-  man.create(fastTransform, nullptr, TimeStamp);
-
-  return doQA(fastTransform);
-}
diff --git a/GPU/TPCFastTransformation/TPCFastTransformQA.h b/GPU/TPCFastTransformation/TPCFastTransformQA.h
deleted file mode 100644
index 727a8a87dbbc0..0000000000000
--- a/GPU/TPCFastTransformation/TPCFastTransformQA.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// \file  TPCFastTransformManager.h
-/// \brief Definition of TPCFastTransformManager class
-///
-/// \author  Sergey Gorbunov <sergey.gorbunov@cern.ch>
-
-#ifndef ALICEO2_GPUCOMMON_TPCFASTTRANSFORMATION_TPCFASTTRANSFORMQA_H
-#define ALICEO2_GPUCOMMON_TPCFASTTRANSFORMATION_TPCFASTTRANSFORMQA_H
-
-#include "GPUCommonDef.h"
-#include "TPCFastTransformManager.h"
-#include "GPUCommonLogger.h"
-
-#include <cmath>
-#include <iostream>
-
-#include "Rtypes.h"
-#include "TString.h"
-#include "AliTPCTransform.h"
-
-namespace o2
-{
-namespace gpu
-{
-
-///
-/// The TPCFastTransformQA class does performance check for TPCFastTransformation object
-///
-
-class TPCFastTransformQA
-{
- public:
-  /// _____________  Constructors / destructors __________________________
-
-  /// Default constructor
-  TPCFastTransformQA();
-
-  /// Copy constructor: disabled
-  TPCFastTransformQA(const TPCFastTransformQA&) = delete;
-
-  /// Assignment operator: disabled
-  TPCFastTransformQA& operator=(const TPCFastTransformQA&) = delete;
-
-  /// Destructor
-  ~TPCFastTransformQA() = default;
-
-  /// _______________  Main functionality  ________________________
-
-  /// create fast transformation and perform a quality check
-  int32_t doQA(long TimeStamp);
-
-  /// create perform quality check
-  int32_t doQA(const TPCFastTransform& fastTransform);
-
- private:
-  /// Stores an error message
-  int32_t storeError(Int_t code, const char* msg);
-  TString mError; ///< error string
-};
-
-inline int32_t TPCFastTransformQA::storeError(int32_t code, const char* msg)
-{
-  mError = msg;
-  LOG(info) << msg;
-  return code;
-}
-} // namespace gpu
-} // namespace o2
-
-#endif
diff --git a/Utilities/DataCompression/include/DataCompression/CodingModelDispatcher.h b/Utilities/DataCompression/include/DataCompression/CodingModelDispatcher.h
deleted file mode 100644
index 68fcc8360df2b..0000000000000
--- a/Utilities/DataCompression/include/DataCompression/CodingModelDispatcher.h
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/* Local Variables:  */
-/* mode: c++         */
-/* End:              */
-
-#ifndef CODINGMODELDISPATCHER_H
-#define CODINGMODELDISPATCHER_H
-
-/// @file   CodingModelDispatcher.h
-/// @author Matthias Richter
-/// @since  2016-09-11
-/// @brief  Runtime dispatcher interface for probability model definitions
-
-#include "mpl_tools.h"
-#include "runtime_container.h"
-#include <iostream>
-#include <fstream>
-#include <boost/type.hpp>
-#include <boost/mpl/for_each.hpp>
-
-using namespace gNeric;
-
-namespace o2
-{
-namespace data_compression
-{
-
-/**
- * @class CodingModelDispatcher Runtime dispatcher interface
- * @brief Runtime dispatcher interface for probability model definitions
- *
- * ModelDefinition single coding model or mpl sequence of models
- *
- * TODO:
- * - consistency check for coding direction, all model definitions have to obey
- *   same direction
- * - probably one should also require the same code type for all definitions, at
- *   least in the codec. Multiple code types do not make much sense in the codec
- */
-template <typename ModelDefinition>
-class CodingModelDispatcher
-{
- public:
-  CodingModelDispatcher() : mPosition(0), mContainer() {}
-  ~CodingModelDispatcher() = default;
-
-  using self_type = CodingModelDispatcher<ModelDefinition>;
-
-  // make_mpl_vector traits makes sure that an mpl sequence is used further on
-  // if the original type is not a sequence it is wrapped into an mpl vector with
-  // the original type as the only element
-  using definition_type = typename mpl::make_mpl_vector<ModelDefinition>::type;
-
-  // the runtime container type is the heart of the dispatcher to runtime objects
-  // of the sequence of data types which define the probability model
-  using container_type = typename create_rtc<definition_type, RuntimeContainer<>>::type;
-
-  using code_type = typename container_type::wrapped_type::code_type;
-
-  /// get the number of models in the definition
-  static int getNumberOfModels() { return boost::mpl::size<definition_type>::value; }
-
-  /// return highest stage of runtime container
-  container_type& operator*() { return mContainer; }
-
-  /// functor to add weight to probability model at runtime container level
-  template <typename ValueType, typename WeightType>
-  class addWeightFctr
-  {
-   public:
-    addWeightFctr(ValueType _v, WeightType _w) : value(_v), weight(_w) {}
-    ~addWeightFctr() {}
-
-    using return_type = bool;
-
-    template <typename T>
-    return_type operator()(T& stage)
-    {
-      // the addWeight function belongs to the probability model as base
-      // of the specific model; funcions of the base can be accessed by
-      // static casting. This avoids an extra level of function calls.
-      return static_cast<typename T::wrapped_type::base_type&>(*stage).addWeight(value, weight);
-    }
-
-   private:
-    ValueType value;
-    WeightType weight;
-  };
-
-  /**
-   * add weight to current model
-   *
-   * Dispatcher increments to the next model definition after decoding if
-   * parameter switchToNextModel is true.
-   */
-  template <typename ValueType, typename WeightType>
-  bool addWeight(ValueType v, WeightType w, bool switchToNextModel = true)
-  {
-    bool result = mContainer.apply(mPosition, addWeightFctr<ValueType, WeightType>(v, w));
-    if (switchToNextModel && ++mPosition >= getNumberOfModels()) {
-      mPosition = 0;
-    }
-    return result;
-  }
-
-  /**
-   * init model
-   */
-  class initFctr
-  {
-   public:
-    initFctr(container_type& container) : mContainer(container) {}
-    ~initFctr() {}
-
-    using return_type = int;
-
-    template <typename T>
-    return_type operator()(boost::type<T>)
-    {
-      T& stage = static_cast<T&>(mContainer);
-      return (*stage).init();
-    }
-
-   private:
-    container_type& mContainer;
-  };
-
-  /**
-   * init dispatcher and models
-   */
-  int init()
-  {
-    mPosition = 0;
-    boost::mpl::for_each<typename container_type::types, boost::type<boost::mpl::_>>(initFctr(mContainer));
-    return 0;
-  }
-
-  /**
-   * TODO: this is tailored to HuffmanCodec for the moment, some generic interface
-   * has to come
-   */
-  class generateFctr
-  {
-   public:
-    generateFctr(container_type& container) : mContainer(container) {}
-    ~generateFctr() {}
-
-    using return_type = int;
-
-    template <typename T>
-    return_type operator()(boost::type<T>)
-    {
-      T& stage = static_cast<T&>(mContainer);
-      return (*stage).GenerateHuffmanTree();
-    }
-
-   private:
-    container_type& mContainer;
-  };
-
-  /**
-   * TODO: maybe 'generate' is not the appropriate name
-   */
-  int generate()
-  {
-    boost::mpl::for_each<typename container_type::types, boost::type<boost::mpl::_>>(generateFctr(mContainer));
-    return 0;
-  }
-
-  /// functor to execute encoding on runtime container level
-  template <typename CodeType, typename ValueType>
-  class encodeFctr
-  {
-   public:
-    encodeFctr(ValueType _v, CodeType& _code, uint16_t& _codeLength) : code(_code), value(_v), codeLength(_codeLength)
-    {
-    }
-    ~encodeFctr() {}
-
-    using return_type = bool;
-
-    template <typename T>
-    return_type operator()(T& stage)
-    {
-      code = (*stage).Encode(value, codeLength);
-      return true;
-    }
-
-   private:
-    CodeType& code;
-    ValueType value;
-    uint16_t& codeLength;
-  };
-
-  /**
-   * Encode a value
-   *
-   * Dispatcher increments to the next model definition after decoding if
-   * parameter switchToNextModel is true.
-   */
-  template <typename CodeType, typename ValueType>
-  bool encode(ValueType v, CodeType& code, uint16_t& codeLength, bool switchToNextModel = true)
-  {
-    bool result = mContainer.apply(mPosition, encodeFctr<CodeType, ValueType>(v, code, codeLength));
-    if (switchToNextModel && ++mPosition >= getNumberOfModels()) {
-      mPosition = 0;
-    }
-    return result;
-  }
-
-  /// Functor to execute decoding on runtime container level
-  template <typename CodeType, typename ValueType>
-  class decodeFctr
-  {
-   public:
-    decodeFctr(ValueType& _v, CodeType _code, uint16_t& _codeLength) : code(_code), value(_v), codeLength(_codeLength)
-    {
-    }
-    ~decodeFctr() {}
-
-    using return_type = bool;
-
-    template <typename T>
-    return_type operator()(T& stage)
-    {
-      value = (*stage).Decode(code, codeLength);
-      return true;
-    }
-
-   private:
-    CodeType code;
-    ValueType& value;
-    uint16_t& codeLength;
-  };
-
-  /**
-   * Decode a code sequence
-   * Code direction can be either from MSB to LSB or LSB to MSB, controlled
-   * by template parameter orderMSB of the probability model.
-   *
-   * Dispatcher increments to the next model definition after decoding if
-   * parameter switchToNextModel is true.
-   */
-  template <typename ValueType, typename CodeType>
-  bool decode(ValueType& v, CodeType code, uint16_t& codeLength, bool switchToNextModel = true)
-  {
-    bool result = mContainer.apply(mPosition, decodeFctr<CodeType, ValueType>(v, code, codeLength));
-    if (switchToNextModel && ++mPosition >= getNumberOfModels()) {
-      mPosition = 0;
-    }
-    return result;
-  }
-
-  class getCodingDirectionFctr
-  {
-   public:
-    using return_type = bool;
-    template <typename T>
-    return_type operator()(T& stage)
-    {
-      return T::wrapped_type::orderMSB;
-    }
-  };
-
-  /**
-   * Get coding direction for model at current position
-   */
-  bool getCodingDirection() { return mContainer.apply(mPosition, getCodingDirectionFctr()); }
-
-  /// write functor
-  class writeFctr
-  {
-   public:
-    writeFctr(std::ostream& out, container_type& container) : mOut(out), mContainer(container) {}
-    ~writeFctr() {}
-
-    using return_type = std::ostream&;
-
-    template <typename T>
-    return_type operator()(boost::type<T>)
-    {
-      T& stage = static_cast<T&>(mContainer);
-      if (T::level::value > 0) {
-        mOut << std::endl; // blank line between dumps
-      }
-      mOut << T::level::value << " " << (*stage).getName() << std::endl;
-      (*stage).write(mOut);
-      return mOut;
-    }
-
-   private:
-    std::ostream& mOut;
-    container_type& mContainer;
-  };
-
-  /**
-   * Write configuration
-   *
-   * TODO: introduce a general storage policy, a text file is used for now
-   */
-  int write(const char* filename = nullptr)
-  {
-    std::ofstream ofile(filename);
-    boost::mpl::for_each<typename container_type::types, boost::type<boost::mpl::_>>(
-      writeFctr(ofile.good() ? ofile : std::cout, mContainer));
-    ofile.close();
-    return 0;
-  }
-
-  /// read functor
-  class readFctr
-  {
-   public:
-    readFctr(std::istream& in, container_type& container) : mIn(in), mContainer(container) {}
-    ~readFctr() {}
-
-    using return_type = bool;
-
-    template <typename T>
-    return_type operator()(boost::type<T>)
-    {
-      T& stage = static_cast<T&>(mContainer);
-      std::string level, name, remaining;
-      mIn >> level;
-      mIn >> name;
-      if (!mIn) {
-        return false;
-      }
-      if (std::stoi(level) != T::level::value || name.compare((*stage).getName())) {
-        std::cerr << "Format error: expecting level '" << T::level::value << "' and name '" << (*stage).getName()
-                  << "', got: " << level << " " << name << std::endl;
-      }
-      std::cout << "reading configuration for model " << name << std::endl;
-      std::getline(mIn, remaining); // flush the current line
-      (*stage).read(mIn);
-      return true;
-    }
-
-   private:
-    std::istream& mIn;
-    container_type& mContainer;
-  };
-
-  /**
-   * Read configuration
-   *
-   * TODO: introduce a general storage policy, a text file is used for now
-   */
-  int read(const char* filename)
-  {
-    std::ifstream input(filename);
-    if (!input.good()) {
-      return -1;
-    }
-    // TODO: probably need mpl fold here to propagate the return value
-    boost::mpl::for_each<typename container_type::types, boost::type<boost::mpl::_>>(readFctr(input, mContainer));
-    return 0;
-  }
-
- private:
-  /// position for cyclic dispatch
-  int mPosition;
-  /// the runtime container
-  container_type mContainer;
-};
-
-} // namespace data_compression
-} // namespace o2
-
-#endif
diff --git a/Utilities/DataCompression/include/DataCompression/runtime_container.h b/Utilities/DataCompression/include/DataCompression/runtime_container.h
deleted file mode 100644
index 363f4220e73f6..0000000000000
--- a/Utilities/DataCompression/include/DataCompression/runtime_container.h
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-//-*- Mode: C++ -*-
-
-#ifndef RUNTIME_CONTAINER_H
-#define RUNTIME_CONTAINER_H
-//****************************************************************************
-//* This file is free software: you can redistribute it and/or modify        *
-//* it under the terms of the GNU General Public License as published by     *
-//* the Free Software Foundation, either version 3 of the License, or        *
-//* (at your option) any later version.                                      *
-//*                                                                          *
-//* Primary Author(s): Matthias Richter <mail@matthias-richter.com>          *
-//*                                                                          *
-//* The authors make no claims about the suitability of this software for    *
-//* any purpose. It is provided "as is" without express or implied warranty. *
-//****************************************************************************
-
-/// @file   runtime_container.h
-/// @author Matthias Richter
-/// @since  2016-09-11
-/// @brief  A general runtime container for a compile time sequence
-/// This file is part of https://github.com/matthiasrichter/gNeric
-
-// clang-format off
-
-// A general runtime container for a compile time sequence
-// of types. A mixin class is used to represent a member of each data
-// type. Every data type in the sequence describes a mixin on top of
-// the previous one. The runtime container accumulates the type
-// properties.
-
-#include <iostream>
-#include <iomanip>
-#include <boost/mpl/equal.hpp>
-#include <boost/mpl/minus.hpp>
-#include <boost/mpl/less.hpp>
-#include <boost/mpl/fold.hpp>
-#include <boost/mpl/lambda.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/push_back.hpp>
-#include <boost/mpl/protect.hpp>
-#include <boost/mpl/begin.hpp>
-#include <boost/mpl/end.hpp>
-#include <boost/mpl/next.hpp>
-#include <boost/mpl/deref.hpp>
-#include <boost/mpl/at.hpp>
-#include <boost/mpl/range_c.hpp>
-#include <boost/mpl/size.hpp>
-
-using namespace boost::mpl::placeholders;
-
-namespace gNeric {
-
-/**
- * @class DefaultInterface
- * @brief The default interface for the RuntimeContainer
- *
- * The common interface for the mixin class. In order to allow entry
- * points to the different levels of the mixin, none of the interface
- * functions has to be declared virtual. The function implementation of
- * the top most mixin would be called otherwise.
- *
- * The mixin technique requires a base class, but it mostly makes sense in
- * the picture of runtime polymorphism and virtual interfaces. The runtime
- * container application is purely using static polymorphism which makes the
- * base interface just to a technical aspect.
- */
-class DefaultInterface
-{
-public:
-  DefaultInterface() {}
-  ~DefaultInterface() {}
-
-  void print() const {}
-};
-
-/**
- * @brief Default initializer does nothing
- */
-struct default_initializer
-{
-  template<typename T>
-  void operator()(T&) {}
-};
-
-/**
- * @brief An initializer for simple types
- * The initializer makes use of truncation for non-float types, and
- * over- and underflow to produce different values in the member
- * of the individual stages in the container.
- * - float types keep the fraction
- * - integral types truncate the fraction
- * - unsigned types undergo an underflow and produce big numbers
- * - 8 bit char produces the '*' character
- *
- * Mainly for testing and illustration purposes.
- */
-struct funny_initializer
-{
-  template<typename T>
-  void operator()(T& v) {v=0; v-=214.5;}
-};
-
-/**
- * @brief Default printer prints nothing
- */
-struct default_printer
-{
-  template<typename T>
-  bool operator()(const T& v, int level = -1) {return false;}
-};
-
-/**
- * @brief Verbose printer prints level and content
- */
-template<bool recursive = true>
-struct verbose_printer_base
-{
-  template<typename T>
-  bool operator()(const T& v, int level = -1) {
-    std::cout << "RC mixin level "
-              << std::setw(2)
-              << level << ": " << v << std::endl;
-    return recursive;
-  }
-};
-
-/**
- * @brief Verbose printer to print levels recursively
- */
-struct recursive_printer : verbose_printer_base<true> {};
-
-// preserve backward compatibility
-typedef recursive_printer verbose_printer;
-
-/**
- * @brief Verbose printer to print a single level
- */
-struct single_printer : verbose_printer_base<false> {};
-
-/**
- * @brief Setter functor, forwards to the container mixin's set function
- */
-template<typename U>
-class set_value {
-public:
-  typedef void return_type;
-  typedef U value_type;
-
-  set_value(U u) : mValue(u) {}
-  template<typename T>
-  return_type operator()(T& t) {
-    *t = mValue;
-  }
-
-private:
-  set_value(); // forbidden
-  U mValue;
-};
-
-/**
- * @brief Adder functor
- */
-template<typename U>
-class add_value {
-public:
-  typedef void return_type;
-  typedef U value_type;
-
-  add_value(U u) : mValue(u) {}
-  template<typename T>
-  return_type operator()(T& t) {
-    *t += mValue;
-  }
-
-private:
-  add_value(); // forbidden
-  U mValue;
-};
-
-/**
- * @brief Getter functor, forwards to the container mixin's get function
- *
- * TODO: make a type trait to either return t.get() if its a container
- * instance or t directly if it is the member object
- */
-template<typename U>
-class get_value {
-public:
-  typedef U return_type;
-  typedef U value_type;
-  class NullType {};
-private:
-  /* could not solve the problem that one has to instantiate Traits
-     with a fixed number of template arguments where wrapped_type
-     would need to be provided already to go into the specialization
-  template<typename InstanceType, typename Dummy = InstanceType>
-  struct Traits {
-    typedef NullType container_type;
-    typedef InstanceType type;
-    static return_type apply(InstanceType& c) {
-      std::cout << "Traits";
-      return c;
-    }
-  };
-  // specialization for container instances
-  template<typename InstanceType>
-  struct Traits<InstanceType, typename InstanceType::wrapped_type> {
-    typedef InstanceType container_type;
-    typedef typename InstanceType::wrapped_type type;
-    static return_type apply(InstanceType& c) {
-      std::cout << "specialized Traits";
-      return c.get();
-    }
-  };
-  */
-
-public:
-  template<typename T>
-  return_type operator()(T& t) {
-    return t.get();
-    //return (typename Traits<T>::type)(t);
-  }
-};
-
-
-/******************************************************************************
- * @brief apply functor to the wrapped member object in the runtime container
- * This meta function recurses through the list while incrementing the index
- * and calls the functor at the required position
- *
- * @note internal meta function for the RuntimeContainers' apply function
- */
-template <
-  typename _ContainerT  // container type
-  , typename _IndexT    // data type of position index
-  , typename _Iterator  // current iterator position
-  , typename _End       // end iterator position
-  , _IndexT  _Index     // current index
-  , typename F          // functor
-  >
-struct rc_apply_at
-{
-  static typename F::return_type apply( _ContainerT& c, _IndexT position, F& f )
-  {
-    if ( position == _Index ) {
-      // this is the queried position, make the type cast to the current
-      // stage of the runtime container and execute function for it.
-      // Terminate loop by forwarding _End as _Iterator and thus
-      // calling the specialization
-      typedef typename boost::mpl::deref< _Iterator >::type stagetype;
-      stagetype& stage = static_cast<stagetype&>(c);
-      return f(stage);
-    } else {
-      // go to next element
-      return rc_apply_at<
-        _ContainerT
-        , _IndexT
-        , typename boost::mpl::next< _Iterator >::type
-        , _End
-        , _Index + 1
-        , F
-        >::apply( c, position, f );
-    }
-  }
-};
-// specialization: end of recursive loop, kicks in if _Iterator matches
-// _End.
-// here we end up if the position parameter is out of bounds
-template <
-  typename _ContainerT  // container type
-  , typename _IndexT    // data type of position index
-  , typename _End       // end iterator position
-  , _IndexT  _Index     // current index
-  , typename F          // functor
-  >
-struct rc_apply_at<_ContainerT
-                   , _IndexT
-                   , _End
-                   , _End
-                   , _Index
-                   , F
-                   >
-{
-  static typename F::return_type apply( _ContainerT& c, _IndexT position, F& f )
-  {
-    // TODO: this is probably the place to throw an exeption because
-    // we are out of bound
-    return typename F::return_type(0);
-  }
-};
-
-/**
- * Apply functor to the specified container level
- *
- * Ignores parameter '_IndexT'
- */
-template<typename _ContainerT
-         , typename _StageT
-         , typename _IndexT
-         , typename F>
-struct rc_apply {
-  typedef typename _ContainerT::types types;
-  static typename F::return_type apply(_ContainerT& c, _IndexT /*ignored*/, F& f)
-  {
-    return f(static_cast<_StageT&>(c));
-  }
-};
-
-/**
- * Generalized dispatcher with the ability for code unrolling
- *
- * The optional template parameter 'Position' can be used to cast directly to
- * the specified level in the runtime container and apply the functor without
- * the recursive loop. The template call with default parameters forwards to
- * the recursive call because 'Position' is set to out of list range.
- */
-template<typename _ContainerT
-         , typename F
-         , typename Position = boost::mpl::size<typename _ContainerT::types>
-         , typename _IndexT = int
-         >
-struct rc_dispatcher {
-  typedef typename _ContainerT::types types;
-  typedef typename boost::mpl::if_<
-    boost::mpl::less<Position,  boost::mpl::size<types> >
-    , rc_apply<_ContainerT, typename boost::mpl::at<types, Position>::type, _IndexT, F>
-    , rc_apply_at<
-      _ContainerT
-      , _IndexT
-      , typename boost::mpl::begin<types>::type
-      , typename boost::mpl::end<types>::type
-      , 0
-      , F
-      >
-    >::type type;
-
-  static typename F::return_type apply(_ContainerT& c, _IndexT position, F& f) {
-    return type::apply(c, position, f);
-  }
-};
-
-/**
- * @class RuntimeContainer The base for the mixin class
- * @brief the technical base of the mixin class
- *
- * The class is necessary to provide the innermost functionality of the
- * mixin.
- *
- * The level of the mixin is encoded in the type 'level' which is
- * incremented in each mixin stage.
- */
-template<typename InterfacePolicy = DefaultInterface
-  , typename InitializerPolicy = default_initializer
-  , typename PrinterPolicy = default_printer>
-struct RuntimeContainer : public InterfacePolicy
-{
-  InitializerPolicy _initializer;
-  PrinterPolicy     _printer;
-  typedef boost::mpl::int_<-1> level;
-  typedef boost::mpl::vector<>::type  types;
-
-  /// get size which is 0 at this level
-  constexpr std::size_t size() const {return 0;}
-
-  void print() {
-    const char* string = "base";
-    _printer(string, level::value);
-  }
-
-  // not yet clear if we need the setter and getter in the base class
-  // at least wrapped_type is not defined in the base
-  //void set(wrapped_type) {mMember = v;}
-  //wrapped_type get() const {return mMember;}
-
-};
-
-/**
- * @class rc_mixin Components for the mixin class
- * @brief Mixin component is used with different data types
- *
- * Each mixin component has a member of the specified type. The container
- * level exports the following data types to the outside:
- * - wrapped_type    the data type at this level
- * - mixin_type      composed type at this level
- * - types           mpl sequence containing all level types
- * - level           a data type containing the level
- */
-template <typename BASE, typename T>
-class rc_mixin : public BASE
-{
-public:
-  rc_mixin() : mMember() {BASE::_initializer(mMember);}
-
-  /// each stage of the mixin class wraps one type
-  typedef T wrapped_type;
-  /// this is the self type
-  typedef rc_mixin<BASE, wrapped_type> mixin_type;
-  /// a vector of all mixin stage types so far
-  typedef typename boost::mpl::push_back<typename BASE::types, mixin_type>::type types;
-  /// increment the level counter
-  typedef typename boost::mpl::plus< typename BASE::level, boost::mpl::int_<1> >::type level;
-  void print() {
-    // use the printer policy of this level, the policy returns
-    // a bool determining whether to call the underlying level
-    if (BASE::_printer(mMember, level::value)) {
-      BASE::print();
-    }
-  }
-
-  /// get size at this stage
-  constexpr std::size_t size() const {return level::value + 1;}
-  /// set member wrapped object
-  void set(wrapped_type v) {mMember = v;}
-  /// get wrapped object
-  wrapped_type get() const {return mMember;}
-  /// get wrapped object reference
-  wrapped_type& operator*() {return mMember;}
-  /// assignment operator to wrapped type
-  wrapped_type& operator=(const wrapped_type& v) {mMember = v; return mMember;}
-  /// type conversion to wrapped type
-  operator wrapped_type() const {return mMember;}
-  /// operator
-  wrapped_type& operator+=(const wrapped_type& v) {mMember += v; return mMember;}
-  /// operator
-  wrapped_type operator+(const wrapped_type& v) {return mMember + v;}
-
-  /// a functor wrapper dereferencing the RC container instance
-  /// the idea is to use this extra wrapper to apply the functor directly to
-  /// the wrapped type, see the comment below
-  template<typename F>
-  class member_apply_at {
-  public:
-    member_apply_at(F& f) : mFunctor(f) {}
-    typedef typename F::return_type return_type;
-    template<typename _T>
-    typename F::return_type operator()(_T& me) {
-      return mFunctor(*me);
-    }
-  private:
-    member_apply_at(); //forbidden
-    F& mFunctor;
-  };
-
-  /// apply functor to the runtime object at index
-  /// TODO: there is a performance issue with this solution, introducing another
-  /// level of functors makes the access much slower compared with applying to
-  /// container instance and using container member functions, tested with the
-  /// add_value functor and bench_runtime_container, also the actual operation
-  /// needs to be checked, the result is not correct for the last check of
-  /// 100000000 iterations
-  /*
-  template<typename F>
-  typename F::return_type applyToMember(int index, F f) {
-    return apply(index, member_apply_at<F>(f));
-  }
-  */
-
-  /*
-   * Apply a functor to the runtime container at index
-   *
-   * For performance tests there is a template option to do an explicite loop
-   * unrolling for the first n (=10) elements. This is however only effective
-   * if the compiler optimization is switched of. This is  in the end a nice
-   * demonstrator for the potential of compiler optimization. Unrolling is
-   * switched on with the compile time switch RC_UNROLL.
-   */
-  template<typename F
-#ifdef RC_UNROLL
-           , bool unroll = true
-#else
-           , bool unroll = false
-#endif
-           >
-  typename F::return_type apply(int index, F f) {
-    if (unroll) {// this is a compile time switch
-      // do unrolling for the first n elements and forward to generic
-      // recursive function for the rest.
-      switch (index) {
-      case 0: return rc_dispatcher<mixin_type, F, boost::mpl::int_<0>, int>::apply(*this, 0, f);
-      case 1: return rc_dispatcher<mixin_type, F, boost::mpl::int_<1>, int>::apply(*this, 1, f);
-      case 2: return rc_dispatcher<mixin_type, F, boost::mpl::int_<2>, int>::apply(*this, 2, f);
-      case 3: return rc_dispatcher<mixin_type, F, boost::mpl::int_<3>, int>::apply(*this, 3, f);
-      case 4: return rc_dispatcher<mixin_type, F, boost::mpl::int_<4>, int>::apply(*this, 4, f);
-      case 5: return rc_dispatcher<mixin_type, F, boost::mpl::int_<5>, int>::apply(*this, 5, f);
-      case 6: return rc_dispatcher<mixin_type, F, boost::mpl::int_<6>, int>::apply(*this, 6, f);
-      case 7: return rc_dispatcher<mixin_type, F, boost::mpl::int_<7>, int>::apply(*this, 7, f);
-      case 8: return rc_dispatcher<mixin_type, F, boost::mpl::int_<8>, int>::apply(*this, 8, f);
-      case 9: return rc_dispatcher<mixin_type, F, boost::mpl::int_<9>, int>::apply(*this, 9, f);
-      }
-    }
-    return rc_dispatcher<mixin_type, F>::apply(*this, index, f);
-  }
-
-private:
-  T mMember;
-};
-
-/**
- * @brief Applying rc_mixin with the template parameters as placeholders
- * The wrapping into an mpl lambda is necessary to separate placeholder scopes
- * in the mpl fold operation.
- */
-typedef typename boost::mpl::lambda< rc_mixin<_1, _2> >::type apply_rc_mixin;
-
-/**
- * @brief check the mixin level to be below specified level
- *
- * @note: the number is specified as a type, e.g. boost::mpl:int_<3>
- */
-template< typename T, typename N > struct rtc_less
-: boost::mpl::bool_<(T::level::value < boost::mpl::minus<N, boost::mpl::int_<1>>::value) > {};
-
-template< typename T, typename N > struct rtc_equal
-: boost::mpl::bool_<boost::mpl::equal<typename T::wrapped_type, N>::type> {};
-
-/**
- * @brief create the runtime container type
- * The runtime container type is build from a list of data types, the recursive
- * build can be optionally stopped at the level of argument N.
- *
- * Usage: typedef create_rtc<types, base>::type container_type;
- */
-template<typename Types, typename Base, typename N = boost::mpl::size<Types>>
-struct  create_rtc
-{
-  typedef typename boost::mpl::lambda<
-    // mpl fold loops over all elements in the list of the first template
-    // parameter and provides this as placeholder _2; for every element the
-    // operation of the third template parameter is applied to the result of
-    // the previous stage which is provided as placeholder _1 to the operation
-    // and initialized to the second template argument for the very first
-    // operation
-    typename boost::mpl::fold<
-      // list of types, each element provided as placeholder _1
-      Types
-      // initializer for the _1 placeholder
-      , Base
-      // recursively applied operation, depending on the outcome of rtc_less
-      // either the next mixin level is applied or the current state is used
-      , boost::mpl::if_<
-          rtc_less<_1, N >
-          // apply mixin level
-          , boost::mpl::apply2< boost::mpl::protect<apply_rc_mixin>::type, _1, _2 >
-          // keep current state by identity
-          , boost::mpl::identity<_1>
-          >
-      >::type
-    >::type type;
-};
-
-/**
- * @brief create an mpl vector of mixin types
- * Every stage in the runtime container contains all the previous ones.
- * The resulting mpl vector of this meta function contains all individual
- * stages.
- *
- * Usage: typedef create_rtc_types<types, base>::type container_types;
- */
-template<typename Types, typename Base, typename N = boost::mpl::size<Types>>
-struct create_rtc_types
-{
-  typedef typename boost::mpl::fold<
-    boost::mpl::range_c<int, 0, N::value>
-    , boost::mpl::vector< >
-    , boost::mpl::push_back<_1, create_rtc<Types , Base , boost::mpl::plus<_2, boost::mpl::int_<1>>>>
-    >::type type;
-};
-
-};// namespace gNeric
-// clang-format on
-
-#endif
diff --git a/Utilities/DataCompression/tpccluster_parameter_model.h b/Utilities/DataCompression/tpccluster_parameter_model.h
deleted file mode 100644
index e8455399f17c1..0000000000000
--- a/Utilities/DataCompression/tpccluster_parameter_model.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "DataCompression/dc_primitives.h"
-#include "DataCompression/HuffmanCodec.h"
-#include <bitset>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/string.hpp>
-
-/**
- * Parameter model definitions
- * - boost mpl vector of alphabets
- */
-using tpccluster_parameter =
-  boost::mpl::vector<BitRangeContiguousAlphabet<uint16_t, 6, boost::mpl::string<'p', 'a', 'd', 'r', 'o', 'w'>>,
-                     BitRangeContiguousAlphabet<uint16_t, 14, boost::mpl::string<'p', 'a', 'd'>>,
-                     BitRangeContiguousAlphabet<uint16_t, 15, boost::mpl::string<'t', 'i', 'm', 'e'>>,
-                     BitRangeContiguousAlphabet<uint16_t, 8, boost::mpl::string<'s', 'i', 'g', 'm', 'a', 'Y', '2'>>,
-                     BitRangeContiguousAlphabet<uint16_t, 8, boost::mpl::string<'s', 'i', 'g', 'm', 'a', 'Z', '2'>>,
-                     BitRangeContiguousAlphabet<uint16_t, 16, boost::mpl::string<'c', 'h', 'a', 'r', 'g', 'e'>>,
-                     BitRangeContiguousAlphabet<uint16_t, 10, boost::mpl::string<'q', 'm', 'a', 'x'>>>;
-/**
- * Definition of Huffman probability models for the above defined alphabets
- *
- * This is a temporary definition, the mpl sequence can be created automatically
- * from the list of alphabet types, but did not manage so far (see below)
- */
-template <typename RepT, int Length, typename Description>
-using Model = o2::HuffmanModel<ProbabilityModel<BitRangeContiguousAlphabet<RepT, Length, Description>>,
-                               o2::HuffmanNode<std::bitset<64>>, true>;
-
-using tpccluster_parameter_models =
-  boost::mpl::vector<Model<uint16_t, /* */ 6, boost::mpl::string<'p', 'a', 'd', 'r', 'o', 'w'>>,
-                     Model<uint16_t, /**/ 14, boost::mpl::string<'p', 'a', 'd'>>,
-                     Model<uint16_t, /**/ 15, boost::mpl::string<'t', 'i', 'm', 'e'>>,
-                     Model<uint16_t, /* */ 8, boost::mpl::string<'s', 'i', 'g', 'm', 'a', 'Y', '2'>>,
-                     Model<uint16_t, /* */ 8, boost::mpl::string<'s', 'i', 'g', 'm', 'a', 'Z', '2'>>,
-                     Model<uint16_t, /**/ 16, boost::mpl::string<'c', 'h', 'a', 'r', 'g', 'e'>>,
-                     Model<uint16_t, /**/ 10, boost::mpl::string<'q', 'm', 'a', 'x'>>>;
-
-/** new approach
-  using basemodels = foldtype
-    < tpccluster_parameter,
-      mpl::lambda<ProbabilityModel<_>>::type
-      >::type;
-
-  using tpcmodels = foldtype
-    < basemodels,
-      mpl::lambda<_, o2::HuffmanNode<std::bitset<64>>>::type
-      >::type;
-*/
-
-/**
- * this was an attemp to create the vector of Huffman models directly
- * from the vector of alphabets
- *
- * For the moment, the placeholders of mpl fold are not expanded, so there are
- * unknown types in the end
- */
-/// very first attemp
-//using namespace boost::mpl::placeholders;
-//
-//typedef boost::mpl::fold<
-//  tpccluster_parameter,
-//  boost::mpl::vector<>,
-//  boost::mpl::push_back<
-//    _1
-//    , AliceO2::HuffmanModel< ProbabilityModel< _2 >, AliceO2::HuffmanNode<std::bitset<64>>, true>
-//    >
-//  >::type models_t;
-
-/// trying with additional lambda levels
-//typedef boost::mpl::string<'T','e','s','t'>::type TestAlphabetName;
-//typedef ContiguousAlphabet<int16_t, -1, 10, TestAlphabetName> TestAlphabet;
-//
-//typedef typename boost::mpl::lambda< ProbabilityModel< _1 > > apply_alphabet;
-//typedef boost::mpl::apply1<apply_alphabet, TestAlphabet>::type TestAlphabetModel;
-//typedef typename boost::mpl::lambda< AliceO2::HuffmanModel< _1, AliceO2::HuffmanNode<std::bitset<64>>, true> > apply_probabilitymodel;
-//typedef typename boost::mpl::apply1<boost::mpl::protect<apply_probabilitymodel>::type, TestAlphabetModel>::type TestHuffmanModel;
-//
-//TestAlphabetModel object;
-//typedef TestAlphabetModel::value_type vtype;
-//
-//std::cout << object.getName() << std::endl;
-
-//typedef boost::mpl::fold<
-//  tpccluster_parameter,
-//  boost::mpl::vector<>,
-//  boost::mpl::push_back<
-//    _1
-//    , boost::mpl::apply1< boost::mpl::protect<apply_huffmanmodel>::type, _2 >
-//    >
-//  >::type models_t;
diff --git a/Utilities/rANS/include/rANS/internal/containers/HistogramInterface.h b/Utilities/rANS/include/rANS/internal/containers/HistogramInterface.h
deleted file mode 100644
index 2c703ede64493..0000000000000
--- a/Utilities/rANS/include/rANS/internal/containers/HistogramInterface.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2019-2023 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-/// @file   HistogramInterface.h
-/// @author Michael Lettrich
-/// @brief  Operations that will be performed on a histogram
-
-#ifndef RANS_INTERNAL_CONTAINERS_HISTOGRAMINTERFACE_H_
-#define RANS_INTERNAL_CONTAINERS_HISTOGRAMINTERFACE_H_
-
-#include <gsl/span>
-
-#include "rANS/internal/common/utils.h"
-
-namespace o2::rans::internal
-{
-
-template <class source_T, class value_T, class difference_T, class derived_T>
-class HistogramInterface
-{
-
- public:
-  using source_type = source_T;
-  using value_type = value_T;
-  using difference_type = difference_T;
-
-  // operations
-  template <typename source_IT>
-  inline derived_T& addSamples(source_IT begin, source_IT end)
-  {
-    static_assert(utils::isCompatibleIter_v<source_type, source_IT>);
-
-    if (begin == end) {
-      return static_cast<derived_T&>(*this);
-    } else {
-      return static_cast<derived_T*>(this)->addSamples(begin, end);
-    }
-  };
-
-  inline derived_T& addSamples(gsl::span<const source_type> samples)
-  {
-    return addSamples(samples.data(), samples.data() + samples.size());
-  };
-
-  template <typename freq_IT>
-  inline derived_T& addFrequencies(freq_IT begin, freq_IT end, difference_type offset)
-  {
-    static_assert(utils::isCompatibleIter_v<value_type, freq_IT>);
-
-    if (begin == end) {
-      return static_cast<derived_T&>(*this);
-    } else {
-      return static_cast<derived_T*>(this)->addFrequencies(begin, end, offset);
-    }
-  };
-
-  inline derived_T& addFrequencies(gsl::span<const value_type> frequencies, difference_type offset)
-  {
-    return addFrequencies(frequencies.data(), frequencies.data() + frequencies.size(), offset);
-  };
-
-  derived_T& operator+(derived_T& other)
-  {
-    return addFrequencies(other.cbegin(), other.cbegin(), other.getOffset());
-  };
-
- protected:
-  HistogramInterface() = default;
-
-  template <typename freq_IT>
-  HistogramInterface(freq_IT begin, freq_IT end, difference_type offset)
-  {
-    static_assert(utils::isIntegralIter_v<freq_IT>);
-    addFrequencies(begin, end, offset);
-  };
-};
-
-} // namespace o2::rans::internal
-
-#endif /* RANS_INTERNAL_CONTAINERS_HISTOGRAMINTERFACE_H_ */
diff --git a/cmake/checks/cxx14-test-aggregate-initialization.cxx b/cmake/checks/cxx14-test-aggregate-initialization.cxx
deleted file mode 100644
index 8dedff45a91f8..0000000000000
--- a/cmake/checks/cxx14-test-aggregate-initialization.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file cxx14-test-aggregate-initialization.cxx
-/// \brief Aggregate member initialization check
-/// \author Adam Wegrzynek <adam.wegrzynek@cern.ch>
-///
-
-struct S {
-  int x;
-  struct Foo {
-    int i;
-    int j;
-    int a[3];
-  } b;
-};
-
-int main()
-{
-  S test{1, 2, 3, 4, 5, 6};
-  return 0;
-}
diff --git a/cmake/checks/cxx14-test-binary-literals.cxx b/cmake/checks/cxx14-test-binary-literals.cxx
deleted file mode 100644
index 8fd1f13b697e5..0000000000000
--- a/cmake/checks/cxx14-test-binary-literals.cxx
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file cxx14-test-binary-literals.cxx
-/// \brief Binary literals check
-/// \author Adam Wegrzynek <adam.wegrzynek@cern.ch>
-///
-
-int main()
-{
-  int bin42 = 0b00101010;
-  int dec42 = 42;
-  return (bin42 == dec42) ? 0 : 1;
-}
diff --git a/cmake/checks/cxx14-test-generic-lambda.cxx b/cmake/checks/cxx14-test-generic-lambda.cxx
deleted file mode 100644
index c80e439f3e6c0..0000000000000
--- a/cmake/checks/cxx14-test-generic-lambda.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file cxx14-test-generic-lambda.cxx
-/// \brief Generic lambdas check
-/// \author Adam Wegrzynek <adam.wegrzynek@cern.ch>
-///
-
-auto glambda = [](auto a) { return a; };
-
-int main()
-{
-  int number = 44;
-  return (glambda(number) == number) ? 0 : 1;
-}
diff --git a/cmake/checks/cxx14-test-make_unique.cxx b/cmake/checks/cxx14-test-make_unique.cxx
deleted file mode 100644
index f7cf6f256b2cd..0000000000000
--- a/cmake/checks/cxx14-test-make_unique.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file cxx14-test-make_unique.cxx
-/// \brief std::make_unique check
-/// \author Adam Wegrzynek <adam.wegrzynek@cern.ch>
-///
-
-#include <memory>
-
-bool checkPointer(int number)
-{
-  auto pointer = std::make_unique<int>(number);
-  return *pointer == number;
-}
-
-int main()
-{
-  bool ret = checkPointer(41);
-  return ret ? 0 : 1;
-}
diff --git a/cmake/checks/cxx14-test-user-defined-literals.cxx b/cmake/checks/cxx14-test-user-defined-literals.cxx
deleted file mode 100644
index 0ef6c74df0a0f..0000000000000
--- a/cmake/checks/cxx14-test-user-defined-literals.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-///
-/// \file cxx14-test-user-defined-literals.cxx
-/// \brief Standard user-defined literals check
-/// \author Adam Wegrzynek <adam.wegrzynek@cern.ch>
-///
-
-#include <chrono>
-#include <complex>
-#include <string>
-
-bool testString()
-{
-  using namespace std::literals;
-  auto strl = "hello world"s;
-  std::string str = "hello world";
-  if (str.compare(strl) == 0) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool testChrono()
-{
-  using namespace std::chrono_literals;
-  auto durl = 60s;
-  std::chrono::seconds dur(60);
-  return (durl == dur);
-}
-
-bool testComplex()
-{
-  using namespace std::literals::complex_literals;
-  auto zl = 1i;
-  std::complex<double> z(0, 1);
-  return (zl == z);
-}
-
-int main() { return (testComplex() && testString() && testChrono()) ? 0 : 1; }
diff --git a/run/o2sim_mbudget.cxx b/run/o2sim_mbudget.cxx
deleted file mode 100644
index 57915bac866d2..0000000000000
--- a/run/o2sim_mbudget.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
-// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
-// All rights not expressly granted are reserved.
-//
-// This software is distributed under the terms of the GNU General Public
-// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-
-#include "../macro/o2sim.C"
-#include <SimConfig/SimConfig.h>
-#include <TStopwatch.h>
-#include <fairlogger/Logger.h>
-
-int main(int argc, char* argv[])
-{
-  TStopwatch timer;
-  timer.Start();
-  auto& conf = o2::conf::SimConfig::Instance();
-  if (!conf.resetFromArguments(argc, argv)) {
-    return 1;
-  }
-
-  // customize the level of output
-  FairLogger::GetLogger()->SetLogScreenLevel(conf.getLogSeverity().c_str());
-  FairLogger::GetLogger()->SetLogVerbosityLevel(conf.getLogVerbosity().c_str());
-
-  // call o2sim "macro"
-  o2sim(false, true);
-
-  o2::utils::ShmManager::Instance().release();
-
-  // print total time
-  LOG(info) << "Simulation process took " << timer.RealTime() << " s";
-
-  // We do this instead of return 0
-  // for the reason that we see lots of problems
-  // with TROOTs atexit mechanism often triggering double-free or delete symptoms.
-  // While this is not optimal ... I think it is for the moment
-  // better to have a stable simulation runtime in contrast to
-  // having to debug complicated "atexit" memory problems.
-  _exit(0);
-}