diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index ca4e6c04523e23186654472142e2cd3c109ac5ea..9bc6ca3fbf399f38786b46e45852bb7784595023 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -1387,15 +1387,12 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             ++imagePacketsArrived;
 
             // emit signal if all packets arrived
-            // && seq >= imagePackets-1
-            if ((imagePacketsArrived >= imagePackets))
+            if (imagePacketsArrived >= imagePackets)
             {
                 // Restart statemachine
                 imagePackets = 0;
                 imagePacketsArrived = 0;
                 emit imageReady(this);
-                //imagePacketsArrived = 0;
-                //imagePackets = 0;
                 //qDebug() << "imageReady emitted. all packets arrived";
             }
         }
@@ -2205,8 +2202,6 @@ QImage UAS::getImage()
         if (!image.loadFromData(imageRecBuffer))
         {
             qDebug() << __FILE__ << __LINE__ << "Loading data from image buffer failed!";
-            //imagePacketsArrived = 0;
-            //imagePackets = 0;
             return QImage();
         }
     }
@@ -2216,7 +2211,6 @@ QImage UAS::getImage()
     imagePackets = 0;
     imageRecBuffer.clear();
     return image;
-
 }
 
 void UAS::requestImage()
diff --git a/src/ui/HUD.cc b/src/ui/HUD.cc
index c8322280e2a307deec641af3b0bc9b5e7be5bc10..48a74c098f220701f98ac73b7bb62d3add39c8b3 100644
--- a/src/ui/HUD.cc
+++ b/src/ui/HUD.cc
@@ -1376,7 +1376,7 @@ void HUD::copyImage(UASInterface* uas)
     {
         QImage temp_im = u->getImage();
         if (temp_im.byteCount() > 0) {
-            this->glImage = temp_im;//u->getImage();
+            this->glImage = temp_im;
         }
 
         // Save to directory if logging is enabled