--- a/Framework/Volumes/ImageBuffer3D.h	Tue May 21 15:20:04 2019 +0200
+++ b/Framework/Volumes/ImageBuffer3D.h	Tue May 21 16:15:06 2019 +0200
@@ -22,8 +22,7 @@
 #pragma once
 
 #include "../StoneEnumerations.h"
-#include "../Toolbox/ParallelSlices.h"
-#include "../Toolbox/VolumeImageGeometry.h"
+#include "../Toolbox/LinearAlgebra.h"
 
 #include <Core/Images/Image.h>
 
@@ -32,7 +31,6 @@
   class ImageBuffer3D : public boost::noncopyable
   {
   private:
-    VolumeImageGeometry    geometry_;  // TODO => Move this out of this class
     Orthanc::Image         image_;
     Orthanc::PixelFormat   format_;
     unsigned int           width_;
@@ -76,16 +74,6 @@
 
     void Clear();
 
-    VolumeImageGeometry& GetGeometry()
-    {
-      return geometry_;
-    }
-
-    const VolumeImageGeometry& GetGeometry() const
-    {
-      return geometry_;
-    }
-
     const Orthanc::ImageAccessor& GetInternalImage() const
     {
       return image_;
@@ -111,9 +99,6 @@
       return format_;
     }
 
-    // TODO - Remove
-    ParallelSlices* GetGeometry(VolumeProjection projection) const;
-    
     uint64_t GetEstimatedMemorySize() const;
 
     bool GetRange(float& minValue,