diff --git a/src/fmri/FlatLayerVisualisation.cpp b/src/fmri/FlatLayerVisualisation.cpp
index 613931b..0a69314 100644
--- a/src/fmri/FlatLayerVisualisation.cpp
+++ b/src/fmri/FlatLayerVisualisation.cpp
@@ -69,7 +69,7 @@ FlatLayerVisualisation::FlatLayerVisualisation(const LayerData &layer, Ordering
     patchTransparancy();
 }
 
-void FlatLayerVisualisation::draw(float time)
+void FlatLayerVisualisation::draw(float)
 {
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_COLOR_ARRAY);
diff --git a/src/fmri/ImageInteractionAnimation.cpp b/src/fmri/ImageInteractionAnimation.cpp
index 57451c3..535eebc 100644
--- a/src/fmri/ImageInteractionAnimation.cpp
+++ b/src/fmri/ImageInteractionAnimation.cpp
@@ -1,7 +1,6 @@
 #include "ImageInteractionAnimation.hpp"
 #include "glutils.hpp"
 #include "MultiImageVisualisation.hpp"
-#include "RenderingState.hpp"
 #include <caffe/util/math_functions.hpp>
 
 using namespace fmri;
@@ -11,9 +10,7 @@ void ImageInteractionAnimation::draw(float step)
 {
     auto &vertexBuffer = animate(startingPositions, deltas, step);
 
-    float alpha = RenderingState::instance().interactionAlpha();
-
-    drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), texture, alpha);
+    drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), texture, getAlpha());
 }
 
 ImageInteractionAnimation::ImageInteractionAnimation(const DType *data, const std::vector<int> &shape, const std::vector<float> &prevPositions,
diff --git a/src/fmri/MultiImageVisualisation.cpp b/src/fmri/MultiImageVisualisation.cpp
index d0ea7a4..0154976 100644
--- a/src/fmri/MultiImageVisualisation.cpp
+++ b/src/fmri/MultiImageVisualisation.cpp
@@ -2,7 +2,6 @@
 #include "MultiImageVisualisation.hpp"
 #include "glutils.hpp"
 #include "Range.hpp"
-#include "RenderingState.hpp"
 
 using namespace fmri;
 using namespace std;
@@ -25,10 +24,9 @@ MultiImageVisualisation::MultiImageVisualisation(const fmri::LayerData &layer)
     texCoordBuffer = getTexCoords(channels);
 }
 
-void MultiImageVisualisation::draw(float time)
+void MultiImageVisualisation::draw(float)
 {
-    float alpha = RenderingState::instance().layerAlpha();
-    drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), texCoordBuffer.data(), texture, alpha);
+    drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), texCoordBuffer.data(), texture, getAlpha());
 }
 
 vector<float> MultiImageVisualisation::getVertices(const std::vector<float> &nodePositions, float scaling)
diff --git a/src/fmri/PoolingLayerAnimation.cpp b/src/fmri/PoolingLayerAnimation.cpp
index dc26233..60b3fb7 100644
--- a/src/fmri/PoolingLayerAnimation.cpp
+++ b/src/fmri/PoolingLayerAnimation.cpp
@@ -4,7 +4,6 @@
 #include "PoolingLayerAnimation.hpp"
 #include "glutils.hpp"
 #include "MultiImageVisualisation.hpp"
-#include "RenderingState.hpp"
 
 using namespace std;
 using namespace fmri;
@@ -33,9 +32,7 @@ void PoolingLayerAnimation::draw(float timeStep)
 {
     auto& vertexBuffer = animate(startingPositions, deltas, timeStep);
 
-    float alpha = RenderingState::instance().interactionAlpha();
-
-    drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), original, alpha);
+    drawImageTiles(vertexBuffer.size() / 3, vertexBuffer.data(), textureCoordinates.data(), original, getAlpha());
 }
 
 Texture PoolingLayerAnimation::loadTextureForData(const LayerData &data)