diff --git a/CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h b/CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h
index 9b46918..7b199dc 100644
--- a/CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h
+++ b/CLUEstering/alpaka/CLUE/CLUEAlgoAlpaka.h
@@ -17,7 +17,6 @@
 #include "../DataFormats/Points.h"
 #include "../DataFormats/alpaka/PointsAlpaka.h"
 #include "../DataFormats/alpaka/TilesAlpaka.h"
-#include "../DataFormats/alpaka/Vector.h"
 #include "CLUEAlpakaKernels.h"
 #include "ConvolutionalKernel.h"
 
@@ -35,7 +34,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     }
 
     TilesAlpaka<Ndim>* m_tiles;
-    clue::Vector<int32_t>* m_seeds;
+    VecArray<int32_t, reserve>* m_seeds;
     VecArray<int32_t, max_followers>* m_followers;
 
     template <typename KernelType>
@@ -56,8 +55,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
 
     // Buffers
     std::optional<cms::alpakatools::device_buffer<Device, TilesAlpaka<Ndim>>> d_tiles;
-    std::optional<cms::alpakatools::device_buffer<Device, int32_t[]>> d_seeds;
-    std::optional<cms::alpakatools::device_buffer<Device, clue::Vector<int32_t>>> seeds;
+    std::optional<cms::alpakatools::device_buffer<Device, VecArray<int32_t, reserve>>>
+        d_seeds;
     std::optional<cms::alpakatools::device_buffer<
         Device,
         cms::alpakatools::VecArray<int32_t, max_followers>[]>>
@@ -108,17 +107,14 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
   template <typename TAcc, uint8_t Ndim>
   void CLUEAlgoAlpaka<TAcc, Ndim>::init_device(Queue queue_) {
     d_tiles = cms::alpakatools::make_device_buffer<TilesAlpaka<Ndim>>(queue_);
-    d_seeds = cms::alpakatools::make_device_buffer<int32_t[]>(queue_, reserve);
-    d_followers = cms::alpakatools::make_device_buffer<
-        cms::alpakatools::VecArray<int32_t, max_followers>[]>(queue_, reserve);
-
-    seeds = cms::alpakatools::make_device_buffer<clue::Vector<int32_t>>(queue_);
-    // resize the seeds vector
-    (*seeds)->resize((*d_seeds).data(), reserve);
+    d_seeds = cms::alpakatools::make_device_buffer<VecArray<int32_t, reserve>>(queue_);
+    d_followers =
+        cms::alpakatools::make_device_buffer<VecArray<int32_t, max_followers>[]>(queue_,
+                                                                                 reserve);
 
     // Copy to the public pointers
     m_tiles = (*d_tiles).data();
-    m_seeds = (*seeds).data();
+    m_seeds = (*d_seeds).data();
     m_followers = (*d_followers).data();
   }
 
@@ -221,7 +217,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
     const Idx grid_size_seeds = cms::alpakatools::divide_up_by(reserve, block_size);
     auto working_div_seeds =
         cms::alpakatools::make_workdiv<Acc1D>(grid_size_seeds, block_size);
-	
+
     alpaka::enqueue(queue_,
                     alpaka::createTaskKernel<Acc1D>(working_div_seeds,
                                                     KernelAssignClusters<Ndim>{},
diff --git a/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h b/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h
index 30546e5..dd1ce91 100644
--- a/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h
+++ b/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h
@@ -9,7 +9,6 @@
 #include "../DataFormats/alpaka/PointsAlpaka.h"
 #include "../DataFormats/alpaka/TilesAlpaka.h"
 #include "../DataFormats/alpaka/AlpakaVecArray.h"
-#include "../DataFormats/alpaka/Vector.h"
 #include "ConvolutionalKernel.h"
 
 using cms::alpakatools::VecArray;
@@ -278,7 +277,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
   struct KernelFindClusters {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(const TAcc& acc,
-                                  clue::Vector<int32_t>* seeds,
+                                  VecArray<int32_t, reserve>* seeds,
                                   VecArray<int32_t, max_followers>* followers,
                                   PointsView<Ndim>* dev_points,
                                   float dm,
@@ -313,7 +312,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
   struct KernelAssignClusters {
     template <typename TAcc>
     ALPAKA_FN_ACC void operator()(const TAcc& acc,
-                                  clue::Vector<int32_t>* seeds,
+                                  VecArray<int32_t, reserve>* seeds,
                                   VecArray<int, max_followers>* followers,
                                   PointsView<Ndim>* dev_points) const {
       const auto& seeds_0{*seeds};
diff --git a/CLUEstering/alpaka/DataFormats/alpaka/Vector.h b/CLUEstering/alpaka/DataFormats/alpaka/Vector.h
deleted file mode 100644
index f3ed59a..0000000
--- a/CLUEstering/alpaka/DataFormats/alpaka/Vector.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-#pragma once
-
-//
-// Author: Simone Balducci
-// Note: Based on Felice's VecArray
-//
-
-namespace clue {
-
-  // TODO: Use a caching allocator to improve dynamic allocation
-  template <typename T>
-  class Vector {
-  private:
-    T* m_data;
-    uint32_t m_size;
-    uint32_t m_capacity;
-
-  public:
-    Vector() = default;
-    Vector(uint32_t size) : m_data(new T[size]), m_size{0}, m_capacity{size} {}
-    Vector(T* data, uint32_t size) : m_data(data), m_size{0}, m_capacity{size} {}
-
-    inline constexpr int push_back_unsafe(const T& element) {
-      auto previousSize = m_size;
-      m_size++;
-      if (previousSize < m_capacity) {
-        m_data[previousSize] = element;
-        return previousSize;
-      } else {
-        --m_size;
-        return -1;
-      }
-    }
-
-    // thread-safe version of the vector, when used in a CUDA kernel
-    template <typename TAcc>
-    ALPAKA_FN_ACC int push_back(const TAcc& acc, const T& element) {
-      auto previousSize =
-          alpaka::atomicAdd(acc, &m_size, 1u, alpaka::hierarchy::Blocks{});
-      if (previousSize < m_capacity) {
-        m_data[previousSize] = element;
-        return previousSize;
-      } else {
-        alpaka::atomicSub(acc, &m_size, 1u, alpaka::hierarchy::Blocks{});
-        assert(("Too few elemets reserved"));
-        return -1;
-      }
-    }
-
-    inline constexpr T const* begin() const { return m_data; }
-    inline constexpr T const* end() const { return m_data + m_size; }
-    inline constexpr T* begin() { return m_data; }
-    inline constexpr T* end() { return m_data + m_size; }
-
-    inline constexpr T const* data() const { return m_data; }
-    inline constexpr T* data() { return m_data; }
-
-    inline constexpr const T& operator[](int i) const { return m_data[i]; }
-    inline constexpr T& operator[](int i) { return m_data[i]; }
-
-    inline constexpr size_t size() const { return m_size; }
-    inline constexpr size_t capacity() const { return m_capacity; }
-
-    inline constexpr bool empty() const { return 0 == m_size; }
-    inline constexpr bool full() const { return m_capacity == m_size; }
-
-    inline constexpr void reset() { m_size = 0; }
-    inline constexpr void resize(T* data, int size) {
-      m_data = data;
-      m_size = 0;
-      m_capacity = size;
-    }
-    inline constexpr void resize(int size) { m_size = size; }
-    inline constexpr void reserve(uint32_t size) {
-      m_capacity = size;
-      m_size = 0;
-
-      // move data to new location
-      T* new_data = new T[size];
-      m_data = new_data;
-      new_data = nullptr;
-    }
-  };
-};  // namespace clue
diff --git a/setup.py b/setup.py
index ae464dc..6d4e902 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 from setuptools import setup
 import subprocess
 
-__version__ = "2.2.10"
+__version__ = "2.2.11"
 
 this_directory = Path(__file__).parent
 long_description = (this_directory/'README.md').read_text()