diff --git a/src/Application/States/PresentationState.cpp b/src/Application/States/PresentationState.cpp
index eed1edb..aee780c 100644
--- a/src/Application/States/PresentationState.cpp
+++ b/src/Application/States/PresentationState.cpp
@@ -17,8 +17,6 @@ void PresentationState::draw(Application * app){
 	ofSetColor(255, 255, 255, 255);
 	app->getSurfaceManager()->draw();
 	ofPopStyle();
-	
-	app->getGui()->draw();
 }
 
 void PresentationState::onMousePressed(Application * app, ofMouseEventArgs & args){
diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp
index 5e233b3..7fba1c0 100644
--- a/src/Surfaces/SurfaceManagerGui.cpp
+++ b/src/Surfaces/SurfaceManagerGui.cpp
@@ -11,20 +11,6 @@ SurfaceManagerGui::SurfaceManagerGui(){
 	_cmdManager = 0;
 }
 
-void SurfaceManagerGui::draw(){
-	if(surfaceManager == 0){
-		return;
-	}
-
-	if(guiMode == GuiMode::TEXTURE_MAPPING){
-		// TODO: Remove this if else together with the SurfaceManagerGui
-	}else if(guiMode == GuiMode::PROJECTION_MAPPING){
-		//projectionEditor.draw();
-	}else if(guiMode == GuiMode::SOURCE_SELECTION){
-		//sourcesEditor.draw();
-	}
-}
-
 void SurfaceManagerGui::mousePressed(ofMouseEventArgs & args){
 	if(guiMode == GuiMode::NONE){
 		return;
diff --git a/src/Surfaces/SurfaceManagerGui.h b/src/Surfaces/SurfaceManagerGui.h
index 676e6fd..adc7b5c 100644
--- a/src/Surfaces/SurfaceManagerGui.h
+++ b/src/Surfaces/SurfaceManagerGui.h
@@ -27,7 +27,6 @@ class SurfaceManagerGui {
     public:
 		SurfaceManagerGui();
 
-		void draw();
 		void mousePressed(ofMouseEventArgs & args);
 		void mouseReleased(ofMouseEventArgs & args);
 		void mouseDragged(ofMouseEventArgs & args);