diff --git a/include/openspace/interaction/interactionhandler.h b/include/openspace/interaction/interactionhandler.h
index 183ae0c0ca..2b56ebe881 100644
--- a/include/openspace/interaction/interactionhandler.h
+++ b/include/openspace/interaction/interactionhandler.h
@@ -76,7 +76,6 @@
 
 #include <openspace/interaction/keyboardcontroller.h>
 #include <openspace/interaction/mousecontroller.h>
-#include <openspace/interaction/remotecontroller.h>
 
 #include <mutex>
 
@@ -95,7 +94,6 @@ public:
 
 	void setKeyboardController(KeyboardController* controller);
 	void setMouseController(MouseController* controller);
-	void setRemoteController(RemoteController* controller);
 	void addController(Controller* controller);
 
 	void lockControls();
@@ -173,7 +171,6 @@ private:
 
 	KeyboardController* _keyboardController;
 	MouseController* _mouseController;
-	RemoteController* _remoteController;
 	std::vector<Controller*> _controllers;
 };
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ba6c172af3..28996a2cf3 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -353,9 +353,6 @@ bool OpenSpaceEngine::initialize() {
 	//_interactionHandler.setMouseController(new interaction::TrackballMouseController);
 	_interactionHandler->setMouseController(new interaction::OrbitalMouseController);
 
-	//@TODO fix this -JK
-	_interactionHandler->setRemoteController(new interaction::RemoteController);
-
 	// Run start up scripts
 	runStartupScripts();
 
diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp
index 3c4ae90b30..11148e379f 100644
--- a/src/interaction/interactionhandler.cpp
+++ b/src/interaction/interactionhandler.cpp
@@ -253,7 +253,6 @@ InteractionHandler::InteractionHandler()
     , _invertRotation(false)
 	, _keyboardController(nullptr)
 	, _mouseController(nullptr)
-	, _remoteController(nullptr)
 {
 }
 
@@ -278,13 +277,6 @@ void InteractionHandler::setMouseController(MouseController* controller) {
 	_mouseController->setHandler(this);
 }
 
-void InteractionHandler::setRemoteController(RemoteController* controller) {
-	assert(controller);
-	delete _remoteController;
-	_remoteController = controller;
-	_remoteController->setHandler(this);
-}
-
 void InteractionHandler::addController(Controller* controller) {
 	assert(controller);
 	_controllers.push_back(controller);
@@ -355,7 +347,6 @@ void InteractionHandler::unlockControls() {
 void InteractionHandler::update(double deltaTime) {
 	_deltaTime = deltaTime;
 	_mouseController->update(deltaTime);
-	_remoteController->update(deltaTime);
 }
 
 void InteractionHandler::setFocusNode(SceneGraphNode* node) {