diff --git a/src/CGraphics.cpp b/src/CGraphics.cpp
index 53c179a3d..31725397f 100644
--- a/src/CGraphics.cpp
+++ b/src/CGraphics.cpp
@@ -645,7 +645,6 @@ unsigned int i,x,y;
    y=yoff;
    for(i=0;i<text.size();i++)
    {
-     if (!text[i]) break;
      if (text[i]!=13)
      {
        sb_drawCharacterwithmask(x, y, text[i], mask);
diff --git a/src/menu.cpp b/src/menu.cpp
index cda465583..5366c46ec 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -1368,15 +1368,12 @@ unsigned int p;
 int x,y,i;
 int boxY, boxH;
 int boxtimer;
-int ep3;
 
-stLevelControl *p_levelcontrol;
-
-	p_levelcontrol = &(pCKP->Control.levelcontrol);
+stLevelControl *p_levelcontrol = &pCKP->Control.levelcontrol;
 
   // on episode 3 we have to subtract one from the map tiles
   // because the tiles start at 31, not 32 like on the other eps
-  ep3 = 0;
+  int ep3 = 0;
   if (p_levelcontrol->episode==3) ep3 = 1;
 
   #define KEENSLEFT_TIME        400