diff --git a/Implementation/GUI/DrawDock.h b/Implementation/GUI/DrawDock.h
index 73a0a5d90328f5732bef2e1b7b7e6de45e51dcae..2cce5f04954c7efa9cdcc5311ff57c944fbf4fdf 100644
--- a/Implementation/GUI/DrawDock.h
+++ b/Implementation/GUI/DrawDock.h
@@ -34,7 +34,6 @@ class DrawDock : public QObject
 public:
     DrawDock(InteractionTool *interaction);
     ~DrawDock();
-    //QDockWidget *getDockWidget();
     bool mouseEvent(QMouseEvent *event,eventType_e type,int w1,int w2,int h1,int h2);
     void setColorVect(QVector<QRgb> colorVect);
     QDockWidget *createDrawDock();
diff --git a/Implementation/GUI/imageviewer.cpp b/Implementation/GUI/imageviewer.cpp
index 1e508bcfddf0c62600e777ff29502aab3eacf00a..ccee3e90e3cc49c4e6dfec290ed67b8a0e390d17 100644
--- a/Implementation/GUI/imageviewer.cpp
+++ b/Implementation/GUI/imageviewer.cpp
@@ -1,54 +1,4 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "imageviewer.h"
+#include "imageviewer.h"
 #include <QtWidgets>
 #include <cstdlib>
 
@@ -234,10 +184,10 @@ void ImageViewer::createActions(){
     normalSizeAct->setShortcut(tr("Ctrl+S"));
     normalSizeAct->setEnabled(false);
     viewMenu->addSeparator();
-    fitToWindowAct = viewMenu->addAction(tr("&Fit to Window"), this, &ImageViewer::fitToWindow);
-    fitToWindowAct->setEnabled(false);
-    fitToWindowAct->setCheckable(true);
-    fitToWindowAct->setShortcut(tr("Ctrl+F"));
+    //fitToWindowAct = viewMenu->addAction(tr("&Fit to Window"), this, &ImageViewer::fitToWindow);
+    //fitToWindowAct->setEnabled(false);
+    //fitToWindowAct->setCheckable(true);
+    //fitToWindowAct->setShortcut(tr("Ctrl+F"));
     QMenu *toolMenu = menuBar()->addMenu(tr("&Tools"));
     drawToolAct = toolMenu->addAction(tr("&Draw"), this, &ImageViewer::draw);
     drawToolAct->setEnabled(false);
diff --git a/Implementation/GUI/imageviewer.h b/Implementation/GUI/imageviewer.h
index 9bea8bdde6419e64cfae5751dc85650f83e65430..de46da24baaa47ecf0f62fbcd814e8f7a37af748 100644
--- a/Implementation/GUI/imageviewer.h
+++ b/Implementation/GUI/imageviewer.h
@@ -1,52 +1,3 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
 #include "InteractionTool.h"
 #include "TranslationDock.h"
 #include "NewLayerDock.h"
@@ -57,8 +8,6 @@
 #ifndef IMAGEVIEWER_H
 #define IMAGEVIEWER_H
 
-
-
 #include <QMainWindow>
 #include <QImage>
 #include <vector>
@@ -71,18 +20,6 @@
 #include <QLabel>
 #include <QCheckBox>
 
-
-QT_BEGIN_NAMESPACE
-class QAction;
-class QLabel;
-class QMenu;
-class QScrollArea;
-class QScrollBar;
-QT_END_NAMESPACE
-
-//typedef enum drawModus {pencil, lines, notFilledRect, filledRect} drawModus_e;
-
-//! [0]
 class ImageViewer : public QMainWindow
 {
     Q_OBJECT
@@ -91,15 +28,8 @@ public:
     ImageViewer(QWidget *parent = nullptr);
     bool loadFile(const QString &);
     bool getHasLayer();
-    //void updateColors();
-    //void updateLayers();
-    //void updateLayerCount();
     QVector<QRgb> getColorVect();
 
-public slots:
-    //void updateVisible();
-    //void newLayer();
-
 protected:
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
@@ -108,9 +38,6 @@ protected:
 private slots:
     void open();
     void saveAs();
-    //void print();
-    //void copy();
-    //void paste();
     void zoomIn();
     void zoomOut();
     void normalSize();
@@ -146,17 +73,12 @@ private:
     QLabel *imageLabel;
     QScrollArea *scrollArea;
     QMenu *viewMenu;
-    //QDockWidget *colorDock;
     QDockWidget *layerDockW;
     QVector<QRgb> colorVect;
     QVector<QRgb> newColorVect;
     QPixmap *pixmap;
-    //QCheckBox *ignoreShaped;
-    //QRadioButton *newColormap[4];
     QPoint move;
-    //QPolygon polyVis;
     bool moveStart = false;
-    //bool isNewLayerColor = false;
     double scaleFactor = 1.0;
     bool hasLayer=false;
     toolParameters_t *param = nullptr;
@@ -170,21 +92,12 @@ private:
     DrawDock *drawDock;
     LayerDock *layerDock;
     ColorDock *colorDock;
-
-
-/*#ifndef QT_NO_PRINTER
-    QPrinter printer;
-#endif
-*/
     QAction *saveAsAct;
-    //QAction *printAct;
-    //QAction *copyAct;
     QAction *zoomInAct;
     QAction *zoomOutAct;
     QAction *normalSizeAct;
     QAction *fitToWindowAct;
     QAction *showColorsAct;
 };
-//! [0]
 
 #endif
diff --git a/Implementation/build-imageviewer-Desktop-Debug/imageviewer b/Implementation/build-imageviewer-Desktop-Debug/imageviewer
index 48bfd2e1007a2af51628a81f49323d462d3f21c1..4eda79d87f4e47e6050294d5554e053072dab27e 100755
Binary files a/Implementation/build-imageviewer-Desktop-Debug/imageviewer and b/Implementation/build-imageviewer-Desktop-Debug/imageviewer differ
diff --git a/Implementation/build-imageviewer-Desktop-Debug/imageviewer.o b/Implementation/build-imageviewer-Desktop-Debug/imageviewer.o
index ab05c727b2331724ace85a9f79d8e53f94c99e1b..d0b8e7a87a55dc8556c774416f837a05a421fd8f 100644
Binary files a/Implementation/build-imageviewer-Desktop-Debug/imageviewer.o and b/Implementation/build-imageviewer-Desktop-Debug/imageviewer.o differ
diff --git a/Implementation/build-imageviewer-Desktop-Debug/main.o b/Implementation/build-imageviewer-Desktop-Debug/main.o
index 839025dedc262abd81e74b1b756284cccadab65a..d9d292b5b3e351c1e8e792e5299a7bc13caab6c8 100644
Binary files a/Implementation/build-imageviewer-Desktop-Debug/main.o and b/Implementation/build-imageviewer-Desktop-Debug/main.o differ
diff --git a/Implementation/build-imageviewer-Desktop-Debug/moc_imageviewer.o b/Implementation/build-imageviewer-Desktop-Debug/moc_imageviewer.o
index 7728e7e1d2aea04bfaabb93e41793db42d0f2337..fce7457547e25e59e7fc9883d1d311d78c11903c 100644
Binary files a/Implementation/build-imageviewer-Desktop-Debug/moc_imageviewer.o and b/Implementation/build-imageviewer-Desktop-Debug/moc_imageviewer.o differ
diff --git a/Implementation/build-imageviewer-Desktop-Release/imageviewer.o b/Implementation/build-imageviewer-Desktop-Release/imageviewer.o
index 783f4e11ab834e57c388b01178b206cd80d7c6a7..80f36ffceb16d7a0db6c2a51b1da5c4bf9f405a9 100644
Binary files a/Implementation/build-imageviewer-Desktop-Release/imageviewer.o and b/Implementation/build-imageviewer-Desktop-Release/imageviewer.o differ