5 files changed, 7 insertions, 17 deletions
diff --git a/ick2/controllerapi.py b/ick2/controllerapi.py
index 340d609..af387ec 100644
--- a/ick2/controllerapi.py
+++ b/ick2/controllerapi.py
@@ -13,12 +13,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import glob
-import os
-
-
 import apifw
-import yaml
 
 
 import ick2
diff --git a/ick2/state.py b/ick2/state.py
index 8fd00c6..ab5d391 100644
--- a/ick2/state.py
+++ b/ick2/state.py
@@ -18,13 +18,9 @@ import glob
 import os
 
 
-import apifw
 import yaml
 
 
-import ick2
-
-
 class ControllerState:
 
     def __init__(self):
@@ -78,7 +74,6 @@ class ControllerState:
 
     def update_project(self, project, body):
         filename = self.get_project_filename(project)
-        dirname = os.path.dirname(filename)
         with open(filename, 'w') as f:
             yaml.safe_dump(body, stream=f)
         return body
diff --git a/ick_controller.py b/ick_controller.py
index 0957ae6..a029145 100644
--- a/ick_controller.py
+++ b/ick_controller.py
@@ -19,7 +19,6 @@ import os
 
 
 import apifw
-import Crypto.PublicKey.RSA
 import slog
 import yaml
 
@@ -47,10 +46,10 @@ default_config = {
 }
 
 
-def load_config(filename, default_config):
-    config = yaml.safe_load(open(filename, 'r'))
-    actual_config = dict(default_config)
-    actual_config.update(config)
+def load_config(filename, defconf):
+    conf = yaml.safe_load(open(filename, 'r'))
+    actual_config = dict(defconf)
+    actual_config.update(conf)
     return actual_config
 
 
diff --git a/pylint.conf b/pylint.conf
index 43750b5..25f7976 100644
--- a/pylint.conf
+++ b/pylint.conf
@@ -5,6 +5,7 @@ persistent=no
 disable=
     invalid-name,
     missing-docstring,
+    no-self-use,
     unused-argument
 
 [REPORTS]
diff --git a/worker_manager b/worker_manager
index 0ba0aab..6204392 100755
--- a/worker_manager
+++ b/worker_manager
@@ -22,7 +22,7 @@ import time
 import cliapp
 import requests
 
-import ick2lib
+import ick2version
 
 
 class WorkerManager(cliapp.Application):
@@ -133,4 +133,4 @@ class WorkerManager(cliapp.Application):
                     r.status_code, r.text))
 
 
-WorkerManager(version=ick2lib.__version__).run()
+WorkerManager(version=ick2version.__version__).run()