diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
index f2a952379..e29a109f0 100644
--- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -547,12 +547,6 @@ static GLXContext getMeAGLContext(Display *display, GLXFBConfig glxFBConfig, boo
 			GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
 			None
 		};
-	/*int legacyctx[] =
-		{
-			GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
-			GLX_CONTEXT_MINOR_VERSION_ARB, 1,
-			None
-		};*/
 	PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = 0;
 	glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
 						glXGetProcAddressARB( (const GLubyte *) "glXCreateContextAttribsARB" );
diff --git a/src/guiengine/widgets/label_widget.cpp b/src/guiengine/widgets/label_widget.cpp
index dd160c6b1..3f8e25ae1 100644
--- a/src/guiengine/widgets/label_widget.cpp
+++ b/src/guiengine/widgets/label_widget.cpp
@@ -105,21 +105,8 @@ void LabelWidget::add()
     m_element->setTabStop(false);
     m_element->setTabGroup(false);
 
-    if (m_scroll_speed > 0)
-    {
-        /*IGUIFont* font = m_title_font ? GUIEngine::getTitleFont()
-                                      : GUIEngine::getFont();
-        core::dimension2du r = font->getDimension(getText().c_str());
-
-        m_scroll_offset = (float)r.Width;
-
-        // start scrolled off
-        m_scroll_offset = -999;*/
-    }
-    else
-    {
+    if (m_scroll_speed <= 0)
         m_element->setNotClipped(true);
-    }
 }   // add
 
 // ----------------------------------------------------------------------------
@@ -139,16 +126,11 @@ void LabelWidget::setText(const wchar_t *text, bool expandIfNeeded)
             rect.LowerRightCorner.X = rect.UpperLeftCorner.X + fwidth;
             m_element->setRelativePosition(rect);
             m_element->updateAbsolutePosition();
-
-            //((IGUIStaticText*)m_element)->setBackgroundColor( video::SColor(255,255,0,0) );
         }
     }
 
     if (m_scroll_speed > 0)
-    {
-        //m_scroll_offset = (float)m_element->getAbsolutePosition().getWidth();
         m_scroll_offset = (float)m_w;
-    }
 
     Widget::setText(text);
     if (m_element)
@@ -181,7 +163,6 @@ bool LabelWidget::scrolledOff() const
 
 void LabelWidget::setScrollSpeed(float speed)
 {
-    //m_scroll_offset = 0;
     m_scroll_speed  = speed;
 }   // setScrollSpeed