diff --git a/Common.cpp b/Common.cpp
deleted file mode 100644
index fd13f09..0000000
--- a/Common.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Common.cpp
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Common.h"
-
-std::vector< std::tr1::shared_ptr<Mapping> > Common::mappings;
-std::vector< std::tr1::shared_ptr<Mapper> > Common::mappers;
-std::tr1::shared_ptr<Mapping> Common::currentMapping;
-std::tr1::shared_ptr<Mapper> Common::currentMapper;
-
-int Common::currentSourceIdx = 0;
-
-Quad* Common::createQuadForTexture(Texture* texture, int frameWidth, int frameHeight)
-{
-  return new Quad(
-    Point(texture->getX(), texture->getY()),
-    Point(texture->getX() + texture->getWidth(), texture->getY()),
-    Point(texture->getX() + texture->getWidth(), texture->getY() + texture->getHeight()),
-    Point(texture->getX(), texture->getY() + texture->getHeight())
-  );
-}
-
-void Common::addImage(const QString imagePath, int frameWidth, int frameHeight)
-{
-  Image* img  = new Image(imagePath);
-
-  img->setPosition( (frameWidth  - img->getWidth() ) / 2.0f,
-                    (frameHeight - img->getHeight()) / 2.0f );
-
-  TextureMapping* tm = new TextureMapping(
-      img,
-      // Destination.
-      createQuadForTexture(img, frameWidth, frameHeight),
-      // Input.
-      createQuadForTexture(img, frameWidth, frameHeight)
-  );
-
-  // Add to data structures.
-  mappings.push_back( std::tr1::shared_ptr<Mapping>(tm) );
-  mappers.push_back( std::tr1::shared_ptr<Mapper>(new QuadTextureMapper( tm )) );
-
-  currentMapping   = mappings[currentSourceIdx];
-  currentMapper    = mappers[currentSourceIdx];
-}
-
-void Common::initializeLibremapper(int frameWidth, int frameHeight)
-{
-  addImage("example.png", frameWidth, frameHeight);
-  addImage("pnggrad8rgb.png", frameWidth, frameHeight);
-}
-
-void Common::switchImage(int imageId)
-{
-  currentSourceIdx = imageId;
-  currentMapping   = mappings[currentSourceIdx];
-  currentMapper    = mappers[currentSourceIdx];
-}
-
-void Common::nextImage()
-{
-  currentSourceIdx = (currentSourceIdx + 1) % mappings.size();
-  currentMapping   = mappings[currentSourceIdx];
-  currentMapper    = mappers[currentSourceIdx];
-}
diff --git a/Common.h b/Common.h
deleted file mode 100644
index a762fe7..0000000
--- a/Common.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Common.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef COMMON_H_
-#define COMMON_H_
-
-#include <tr1/memory>
-
-#include "Paint.h"
-#include "Shape.h"
-#include "Mapper.h"
-
-/**
- * The main MapMap engine that deals with video mapping projects.
- */
-class Common
-{
-public:
-  static std::vector<Mapping::ptr> mappings;
-  static std::vector<Mapper::ptr> mappers;
-  static Mapping::ptr currentMapping;
-  static Mapper::ptr currentMapper;
-
-  static int currentSourceIdx;
-
-  static int getCurrentSourceId() { return currentSourceIdx; }
-
-  static Quad* createQuadForTexture(Texture* texture, int frameWidth, int frameHeight);
-  static void addImage(const QString imagePath, int frameWidth, int frameHeight);
-  static void initializeLibremapper(int frameWidth, int frameHeight);
-
-  static void switchImage(int imageId);
-
-  // deprecated
-  static void nextImage();
-
-  static int nImages()
-  {
-    return mappings.size();
-  }
-};
-
-#endif /* COMMON_H_ */
diff --git a/main.cpp b/main.cpp
index 658838c..91adb3c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,7 +3,6 @@
 #include <iostream>
 #include <QTranslator>
 #include <QtGui>
-#include "Common.h"
 #include "MainWindow.h"
 #include "MainApplication.h"