diff --git a/bin/cdist b/bin/cdist
index 369fbd29..ed71249c 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -48,16 +48,6 @@ BANNER = """
    "P'        ""         ""
 """
 
-# Given paths from installation
-REMOTE_BASE_DIR                 = "/var/lib/cdist"
-REMOTE_CONF_DIR                 = os.path.join(REMOTE_BASE_DIR, "conf")
-REMOTE_OBJECT_DIR               = os.path.join(REMOTE_BASE_DIR, "object")
-REMOTE_TYPE_DIR                 = os.path.join(REMOTE_CONF_DIR, "type")
-REMOTE_GLOBAL_EXPLORER_DIR      = os.path.join(REMOTE_CONF_DIR, "explorer")
-
-CODE_HEADER                     = "#!/bin/sh -e\n"
-DOT_CDIST                       = ".cdist"
-TYPE_PREFIX                     = "__"
 VERSION                         = "2.0.1"
 
 logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
diff --git a/lib/cdist/exec.py b/lib/cdist/exec.py
index aca1d689..4b61a097 100644
--- a/lib/cdist/exec.py
+++ b/lib/cdist/exec.py
@@ -22,9 +22,7 @@
 import logging
 import subprocess
 
-logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
-log = logging.getLogger()
-
+log = logging.getLogger(__name__)
 
 def shell_run_or_debug_fail(script, *args, **kargs):
     # Manually execute /bin/sh, because sh -e does what we want
diff --git a/lib/cdist/path.py b/lib/cdist/path.py
index c2cef1a6..401e3c46 100644
--- a/lib/cdist/path.py
+++ b/lib/cdist/path.py
@@ -35,8 +35,7 @@ CODE_HEADER                     = "#!/bin/sh -e\n"
 DOT_CDIST                       = ".cdist"
 TYPE_PREFIX                     = "__"
 
-logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
-log = logging.getLogger()
+log = logging.getLogger(__name__)
 
 import cdist.exec