diff --git a/main.cpp b/main.cpp
index eaf6a9f..1317043 100644
--- a/main.cpp
+++ b/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
     QCommandLineOption pluginDirectoryOption(QStringList() << "plugin-directory" << "plugin-directory",
         QCoreApplication::translate("main", "Where to find dc-plugin."),
         QCoreApplication::translate("main", "directory"));
-    QString const pluginDefault = "./plugins";
+    QString const pluginDefault = "/usr/lib";
     pluginDirectoryOption.setDefaultValue(pluginDefault);
     parser.addOption(pluginDirectoryOption);
 
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
     QCommandLineOption workingDirectoryOption(QStringList() << "working-directory" << "working-directory",
         QCoreApplication::translate("main", "working directory of update-script."),
         QCoreApplication::translate("main", "directory"));
-    QString const workingDirectoryDefault = ".";
+    QString const workingDirectoryDefault = "/opt/app/tools/atbupdate";
     workingDirectoryOption.setDefaultValue(workingDirectoryDefault);
     parser.addOption(workingDirectoryOption);
 
@@ -87,14 +87,6 @@ int main(int argc, char *argv[]) {
         QCoreApplication::translate("main", "Start ATBUpdateTool in dry-run-mode. No actual actions."));
     parser.addOption(dryRunOption);
 
-    // TODO:
-    // add some additional parameters
-    // --dry-run
-    // -d: only update device-controller firmware
-    // -j: only update json-files
-    // -o: only execute opkg-commnds
-    // -f: force. update_psa shall always perform a 'git pull'
-
     // Process the actual command line arguments given by the user
     parser.process(a);
     QString plugInDir = parser.value(pluginDirectoryOption);
@@ -103,9 +95,6 @@ int main(int argc, char *argv[]) {
     bool dryRun = parser.isSet(dryRunOption);
     QString const rtPath = QCoreApplication::applicationDirPath();
 
-    if (plugInDir == pluginDefault) {
-        plugInDir = (rtPath + "/" + pluginDefault);
-    }
     if (!QDir(plugInDir).exists()) {
         qCritical() << plugInDir
                     << "does not exists, but has to contain dc-library";