diff --git a/src/gui/src/Plugin.cpp b/src/gui/src/Plugin.cpp
index d5ce909a..e2555399 100644
--- a/src/gui/src/Plugin.cpp
+++ b/src/gui/src/Plugin.cpp
@@ -18,16 +18,6 @@
 #include "Plugin.h"
 
 #include "CoreInterface.h"
-//#include "CommandProcess.h"
-//#include "DataDownloader.h"
-//#include "QUtility.h"
-//#include "ProcessorArch.h"
-//#include "Fingerprint.h"
-
-//#include <QFile>
-//#include <QDir>
-//#include <QProcess>
-//#include <QCoreApplication>
 
 static const char kBaseUrl[] = "http://synergy-project.org/files";
 static const char kDefaultVersion[] = "1.1";
@@ -41,15 +31,15 @@ static const char kLinuxPackagePlatformRpm64[] = "Linux-x86_64-rpm";
 
 #if defined(Q_OS_WIN)
 static const char kWinPluginExt[] = ".dll";
-static const char kInstallerPluginLocation[] = "C:/Program Files/Synergy/Plugins/"; //TODO: needs proper windows %X% notation
+static const char kInstallerPluginLocation[] = "Plugins";
 #elif defined(Q_OS_MAC)
 static const char kMacPluginPrefix[] = "lib";
 static const char kMacPluginExt[] = ".dylib";
-static const char kInstallerPluginLocation[] = "/usr/lib/synergy/plugins";
+static const char kInstallerPluginLocation[] = "plugins";
 #else
 static const char kLinuxPluginPrefix[] = "lib";
 static const char kLinuxPluginExt[] = ".so";
-static const char kInstallerPluginLocation[] = "/usr/lib/synergy/plugins";
+static const char kInstallerPluginLocation[] = "plugins";
 #endif
 
 QString Plugin::getOsSpecificExt()