diff --git a/Geometry/CMakeLists.txt b/Geometry/CMakeLists.txt
index a2e5ce32b97a7690173213a168540828b50bfb4f..9798dedd3c4ca64ace8ef24ee9117de25229599d 100644
--- a/Geometry/CMakeLists.txt
+++ b/Geometry/CMakeLists.txt
@@ -12,7 +12,6 @@ target_link_libraries(Geometry
   PRIVATE
     Core
     Mesh
-    Rendering
     IO
 )
 
diff --git a/Geometry/MeshModel.cpp b/Geometry/MeshModel.cpp
index e1b028b47308aae47b93b1013aa4a6a919fba1d5..38b2dd9bbdcfad2424f307da22246c7c7ec8ec7c 100644
--- a/Geometry/MeshModel.cpp
+++ b/Geometry/MeshModel.cpp
@@ -22,7 +22,6 @@
 //---------------------------------------------------------------------------
 
 #include "Geometry/MeshModel.h"
-#include "Rendering/TextureManager.h"
 #include "IO/IOMesh.h"
 #include "Core/RenderDelegate.h"
 
@@ -78,11 +77,17 @@ void MeshModel::addTexture(const std::string& textureFileName, const std::string
         std::cerr << "Cant assign texture to non-surface mesh." << std::endl;
         return;
     }
-    //Initialize the texture manager
-    TextureManager::init();
 
-    //Load in the texture for the model
-    TextureManager::addTexture(textureFileName, textureName);
+    if(surfaceMesh->getRenderDetail())
+    {
+        surfaceMesh->getRenderDetail()->setTextureFilename(textureFileName);
+    }
+    else
+    {
+        auto renderDetail = std::make_shared<RenderDetail>();
+        renderDetail->setTextureFilename(textureFileName);
+        surfaceMesh->setRenderDetail(renderDetail);
+    }
 
     surfaceMesh->assignTexture(textureName);
 }
diff --git a/Mesh/VegaVolumetricMesh.cpp b/Mesh/VegaVolumetricMesh.cpp
index e92b793ae66c3b821287f722ab34c292abd16d66..708a303083cf07b0f454a27664dd3ac18359a1c0 100644
--- a/Mesh/VegaVolumetricMesh.cpp
+++ b/Mesh/VegaVolumetricMesh.cpp
@@ -148,7 +148,7 @@ void VegaVolumetricMesh::updateAttachedMeshes(double *q)
         {
             vertices[i] = restPositions[i] + displacements[i];
         }
-        renderingMesh->computeTriangleNormals();
+//         renderingMesh->computeTriangleNormals();
         renderingMesh->getRenderDelegate()->modified();
     }