diff --git a/libraries/entropy.py b/libraries/entropy.py
index 9d264b944..84f080dab 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -12197,16 +12197,7 @@ class PortageInterface:
     def _portage_doebuild(self, myebuild, mydo, tree, cpv, portage_tmpdir = None, licenses = []):
         # myebuild = path/to/ebuild.ebuild with a valid unpacked xpak metadata
         # tree = "bintree"
-        # tree = "bintree"
         # cpv = atom
-        '''
-            # This is a demonstration that Sabayon team love Gentoo so much
-            [01:46] <zmedico> if you want something to stay in mysettings
-            [01:46] <zmedico> do mysettings.backup_changes("CFLAGS") for example
-            [01:46] <zmedico> otherwise your change can get lost inside doebuild()
-            [01:47] <zmedico> because it calls mysettings.reset()
-            # ^^^ this is DA MAN!
-        '''
         # mydbapi = portage.fakedbapi(settings=portage.settings)
         # vartree = portage.vartree(root=myroot)
 
diff --git a/libraries/entropyConstants.py b/libraries/entropyConstants.py
index 48ddea4ac..cc3f81dbd 100644
--- a/libraries/entropyConstants.py
+++ b/libraries/entropyConstants.py
@@ -477,8 +477,7 @@ def initConfig_entropyConstants(rootdir):
     const_defaultSettings(rootdir)
     const_readEntropyRelease()
     const_createWorkingDirectories()
-    if not "--no-pid-handling" in sys.argv:
-        const_setupEntropyPid()
+    const_setupEntropyPid()
     const_readEntropySettings()
     const_readRepositoriesSettings()
     const_readSocketSettings()
@@ -1106,6 +1105,10 @@ def const_readEquoSettings():
                     etpConst['configprotectskip'].append(etpConst['systemroot']+x)
 
 def const_setupEntropyPid():
+
+    if "--no-pid-handling" in sys.argv:
+        return
+
     # PID creation
     pid = os.getpid()
     if os.path.isfile(etpConst['pidfile']):