diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
index a30108751..8b4ee3453 100644
--- a/src/graphics/render.cpp
+++ b/src/graphics/render.cpp
@@ -502,13 +502,13 @@ void IrrDriver::renderShadows(ShadowImportanceProvider * const sicb,
                 m_rtts->getRTT(RTT_WARPV)->getSize().Height,
                 m_rtts->getRTT(RTT_WARPV)->getSize().Height);
 
-    sq.setMaterialType(m_shaders->getShader(ES_GAUSSIAN6H));
+/*    sq.setMaterialType(m_shaders->getShader(ES_GAUSSIAN6H));
     sq.setTexture(m_rtts->getRTT(RTT_WARPH));
     sq.render(m_rtts->getRTT(curh));
 
     sq.setMaterialType(m_shaders->getShader(ES_GAUSSIAN6V));
     sq.setTexture(m_rtts->getRTT(RTT_WARPV));
-    sq.render(m_rtts->getRTT(curv));
+    sq.render(m_rtts->getRTT(curv));*/
 
     // Convert importance maps to warp maps
     //
@@ -649,19 +649,7 @@ void IrrDriver::renderGlow(video::SOverrideMaterial &overridemat,
     m_post_processing->drawQuad(cam, minimat);
 
     // Blur it
-    ((GaussianBlurProvider *) m_shaders->m_callbacks[ES_GAUSSIAN3H])->setResolution(
-                UserConfigParams::m_width / 4,
-                UserConfigParams::m_height / 4);
-
-    minimat.MaterialType = m_shaders->getShader(ES_GAUSSIAN6H);
-    minimat.setTexture(0, m_rtts->getRTT(RTT_QUARTER1));
-    m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_QUARTER2), false, false);
-    m_post_processing->drawQuad(cam, minimat);
-
-    minimat.MaterialType = m_shaders->getShader(ES_GAUSSIAN6V);
-    minimat.setTexture(0, m_rtts->getRTT(RTT_QUARTER2));
-    m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_QUARTER1), false, false);
-    m_post_processing->drawQuad(cam, minimat);
+	m_post_processing->renderGaussian6Blur(m_rtts->getRTT(RTT_QUARTER1), m_rtts->getRTT(RTT_QUARTER2), 4.f / UserConfigParams::m_width, 4.f / UserConfigParams::m_height);
 
     // The glows will be rendered in the transparent phase
     m_video_driver->setRenderTarget(m_rtts->getRTT(RTT_COLOR), false, false);
diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp
index 47d36def8..013c7ab96 100644
--- a/src/graphics/shaders.cpp
+++ b/src/graphics/shaders.cpp
@@ -122,11 +122,6 @@ void Shaders::loadShaders()
 	m_shaders[ES_GAUSSIAN3V] = glslmat(dir + "pass.vert", dir + "gaussian3v.frag",
                                     m_callbacks[ES_GAUSSIAN3V], EMT_SOLID);
 
-	m_shaders[ES_GAUSSIAN6H] = glslmat(dir + "pass.vert", dir + "gaussian6h.frag",
-                                    m_callbacks[ES_GAUSSIAN3H], EMT_SOLID);
-	m_shaders[ES_GAUSSIAN6V] = glslmat(dir + "pass.vert", dir + "gaussian6v.frag",
-                                    m_callbacks[ES_GAUSSIAN3V], EMT_SOLID);
-
     m_shaders[ES_MIPVIZ] = glslmat(std::string(""), dir + "mipviz.frag",
                                     m_callbacks[ES_MIPVIZ], EMT_SOLID);
 
diff --git a/src/graphics/shaders.hpp b/src/graphics/shaders.hpp
index 758e39f44..6f71fe00c 100644
--- a/src/graphics/shaders.hpp
+++ b/src/graphics/shaders.hpp
@@ -40,8 +40,6 @@ using namespace irr;
     ACT(ES_MIPVIZ) \
     ACT(ES_FLIP) \
     ACT(ES_FLIP_ADDITIVE) \
-    ACT(ES_GAUSSIAN6H) \
-    ACT(ES_GAUSSIAN6V) \
     ACT(ES_COLORIZE) \
     ACT(ES_COLORIZE_REF) \
     ACT(ES_PASS) \