diff --git a/src/graphics/command_buffer.cpp b/src/graphics/command_buffer.cpp
index d2f09a962..3c5e9762c 100644
--- a/src/graphics/command_buffer.cpp
+++ b/src/graphics/command_buffer.cpp
@@ -166,9 +166,6 @@ void SolidCommandBuffer::fill(MeshMap *mesh_map)
 
     fillInstanceData<InstanceDataFourTex, MeshMap>
         (mesh_map, four_tex_material_list, InstanceTypeFourTex);
-                   /* glBindBuffer(GL_DRAW_INDIRECT_BUFFER, m_draw_indirect_cmd_id);
-                         glFlushMappedBufferRange(GL_DRAW_INDIRECT_BUFFER, 0,10000 * 20);
-                                             glBindBuffer(GL_DRAW_INDIRECT_BUFFER,0);*/
     if (!CVS->supportsAsyncInstanceUpload())
         glUnmapBuffer(GL_DRAW_INDIRECT_BUFFER);
 } //SolidCommandBuffer::fill
diff --git a/src/graphics/command_buffer.hpp b/src/graphics/command_buffer.hpp
index 23349ff43..2706b9239 100644
--- a/src/graphics/command_buffer.hpp
+++ b/src/graphics/command_buffer.hpp
@@ -218,10 +218,6 @@ protected:
                           mesh_map,
                           instance_buffer);
         }
-                    /*glBindBuffer(GL_ARRAY_BUFFER,
-                         VAOManager::getInstance()->getInstanceBuffer(instance_type));
-                         glFlushMappedBufferRange(GL_ARRAY_BUFFER, 0,10000 * sizeof(InstanceDataThreeTex));
-                                             glBindBuffer(GL_ARRAY_BUFFER,0);*/
         if (!CVS->supportsAsyncInstanceUpload())
         {
             glUnmapBuffer(GL_ARRAY_BUFFER);
diff --git a/src/graphics/draw_calls.cpp b/src/graphics/draw_calls.cpp
index 0073fc73c..58170838d 100644
--- a/src/graphics/draw_calls.cpp
+++ b/src/graphics/draw_calls.cpp
@@ -721,8 +721,8 @@ void DrawCalls::prepareDrawCalls( ShadowMatrices& shadow_matrices,
     solid_poly_count = m_solid_cmd_buffer->getPolyCount();
     shadow_poly_count = m_shadow_cmd_buffer->getPolyCount();    
 
-    //if (CVS->supportsAsyncInstanceUpload())
-    //    glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
+    if (CVS->supportsAsyncInstanceUpload())
+        glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
 #endif // !defined(USE_GLES2)
 }