diff --git a/PPI/SConscript b/PPI/SConscript
index de2d369b00e9c0550b5de909266cbfbe5499efcc..b7ee214c84ff9cbb3010ceb2e0c231903579dbe3 100644
--- a/PPI/SConscript
+++ b/PPI/SConscript
@@ -10,7 +10,7 @@ SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
                                   and not f.endswith('.test.hh') ])
 
 sources, includes = SENFSCons.Glob(env, subdirs=[ 'detail' ])
-SENFSCons.StandardTargets(env)
+
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env, extra_sources=[
     env.Dia2Png('scenario.dia'),
diff --git a/Packets/80211Bundle/SConscript b/Packets/80211Bundle/SConscript
index 2f25bc2d4839dc1c3998f0719fb993592909a48a..ac3152232e9bbc6e8c668edd48c09780b8fd6530 100644
--- a/Packets/80211Bundle/SConscript
+++ b/Packets/80211Bundle/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Object(env, target='80211Bundle', sources=sources)
 SENFSCons.Lib(env, sources=sources[0])
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Packets/80221Bundle/SConscript b/Packets/80221Bundle/SConscript
index e8ad4486ed19f09a7146e1b5081f1ea21c4b143a..c065a7b1ed00ecd9cf38a203ea88e49fdfb3d101 100644
--- a/Packets/80221Bundle/SConscript
+++ b/Packets/80221Bundle/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Object(env, target = '80221Bundle', sources=sources)
 SENFSCons.Lib(env, sources[0])
 
diff --git a/Packets/DefaultBundle/SConscript b/Packets/DefaultBundle/SConscript
index 1f703127a3e61f7d5cc01446a81271a1ab040f6c..47b7a11321d59dd00d8c26685a3f3df7b0c08707 100644
--- a/Packets/DefaultBundle/SConscript
+++ b/Packets/DefaultBundle/SConscript
@@ -6,7 +6,7 @@ import SENFSCons, glob
 ###########################################################################
 
 sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
+
 SENFSCons.Object(env, target='DefaultBundle', sources=sources)
 SENFSCons.Lib(env, sources[0])
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Packets/MPEGDVBBundle/SConscript b/Packets/MPEGDVBBundle/SConscript
index b998615cd97400ed04710ab39a45762646395bc9..654bbe52cc323d762c668161c7e932e33b1abdd0 100644
--- a/Packets/MPEGDVBBundle/SConscript
+++ b/Packets/MPEGDVBBundle/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Object(env, target='MPEGDVBBundle', sources=sources)
 SENFSCons.Lib(env, sources[0])
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Packets/SConscript b/Packets/SConscript
index 64482f2139a4a7c922e92831f9ae03c610564aa2..55bf07c5b144a7f962ee850f49fa4f82ccb082e8 100644
--- a/Packets/SConscript
+++ b/Packets/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env, extra_sources = [
     env.Dia2Png("structure.dia"),
diff --git a/SConstruct b/SConstruct
index cca03b8a6e56ecca1c286c59bf0b2189b0af4efe..df9190b553dd42c7b476720996882289183f9e1c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -36,12 +36,6 @@ fixlinks     Fix broken links in doxygen documentation
 valgrind     Run all tests under valgrind/memcheck
 """)
 
-# Compile options
-
-# Options used to debug inlining:
-#
-# BEWARE: You need lots of ram to compile with these settings (approx 1G)
-
 class BuildTypeOptions:
     def __init__(self, var):
         self._var = var
@@ -52,7 +46,7 @@ class BuildTypeOptions:
 
 env.Append(
    ENV                    = { 'PATH' : os.environ.get('PATH') },
-   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],
+   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', '.sconsign' ],
 
    CPPPATH                = [ '#/include' ],
    LOCALLIBDIR            = '#',
@@ -145,10 +139,9 @@ if os.path.exists('SConscript.local'):
 SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts)))
 
 # Define the main targets
-SENFSCons.StandardTargets(env)
-SENFSCons.GlobalTargets(env)
+env.Alias('all', [ 'default', 'all_tests', 'all_docs' ])
 
-env.Depends( SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION']) )
+env.Depends(SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION']))
 
 libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS'])
 env.Default(libsenf)
diff --git a/Scheduler/SConscript b/Scheduler/SConscript
index fe44ea8d50052c2b15cdce23107b8e68aeaedacf..73103906d181cb4e508c58cd71a06166b553047e 100644
--- a/Scheduler/SConscript
+++ b/Scheduler/SConscript
@@ -7,7 +7,6 @@ import SENFSCons
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Socket/Protocols/SConscript b/Socket/Protocols/SConscript
index 6e76b2540afc3aa5fdc3e94f1223840e17ba6b4e..dee839eb5262961811b80052a34f732cf003b8da 100644
--- a/Socket/Protocols/SConscript
+++ b/Socket/Protocols/SConscript
@@ -7,8 +7,6 @@ import SENFSCons, glob
 
 SConscript(glob.glob("*/SConscript"))
 
-SENFSCons.StandardTargets(env)
-
 sources, includes = SENFSCons.Glob(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Socket/SConscript b/Socket/SConscript
index 9b0870f9a2e2c37c0cb17360ea5609ef6a20d999..0e7b440dde548ef771db8c5e5cca07d743e72ded 100644
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -12,7 +12,6 @@ SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources = sources)
 SENFSCons.Doxygen(env, extra_sources = [
     env.Dia2Png('SocketLibrary-classes.dia'),
diff --git a/Utils/Console/SConscript b/Utils/Console/SConscript
index c54f55c995fdb4078473b108042b599839444d4f..026e3c26e0738a905e37571fb41ed46de7a53799 100644
--- a/Utils/Console/SConscript
+++ b/Utils/Console/SConscript
@@ -7,7 +7,6 @@ import SENFSCons
 
 sources, includes = SENFSCons.Glob(env, exclude=['testServer.cc'])
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/Daemon/SConscript b/Utils/Daemon/SConscript
index a3ece3dcb5c5ba60b461a64ecc382f3612654053..1b7e8febeafe6afd585034ccee6ece4807a2a081 100644
--- a/Utils/Daemon/SConscript
+++ b/Utils/Daemon/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/Logger/SConscript b/Utils/Logger/SConscript
index a25eedeeaf94f51675bff838bb41a3474ee33bf0..a3803c6f8cf7022b306212afd5f8daec26246803 100644
--- a/Utils/Logger/SConscript
+++ b/Utils/Logger/SConscript
@@ -11,7 +11,6 @@ SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
 
 sources, includes = SENFSCons.Glob(env)
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/SConscript b/Utils/SConscript
index e07dec065691b15aa77517af3561e62f3ca9982d..a39548afcdeedca764c4e17c91856def29bf02e7 100644
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob, os.path
 
 sources, includes = SENFSCons.Glob(env, subdirs=[ 'impl' ])
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/Termlib/SConscript b/Utils/Termlib/SConscript
index 7fe6526a202f2db1735b2fa651ccd5499700e9a1..ffacf97faa7eaa9a64c59c1edd232995bd8e9af5 100644
--- a/Utils/Termlib/SConscript
+++ b/Utils/Termlib/SConscript
@@ -7,7 +7,6 @@ import SENFSCons
 
 sources, includes = SENFSCons.Glob(env, exclude=[ 'telnetServer.cc'])
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Lib(env, sources)
 SENFSCons.Doxygen(env)
 SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/senfscons/SConscript b/senfscons/SConscript
index d63adf46f90118195652b6e6acc8d829637acb5b..d4cc4aab0d0834fe438598362e068b322b351039 100644
--- a/senfscons/SConscript
+++ b/senfscons/SConscript
@@ -3,5 +3,4 @@ import SENFSCons
 
 ###########################################################################
 
-SENFSCons.StandardTargets(env)
 SENFSCons.Doxygen(env)
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 176b8ea670ff190dcc104ed4fc2c6caab5b8221f..767c03106cfd6bc4a965613ee819edf772bfeed2 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -78,28 +78,6 @@ def Glob(env, exclude=[], subdirs=[]):
     return ( GlobSources(env, exclude, subdirs),
              GlobIncludes(env, exclude, subdirs) )
 
-## \brief Add generic standard targets for every module
-#
-# This target helper should be called in the top-level \c SConstruct file
-# as well as in every module \c SConscipt file. It adds general
-# targets. Right now, these are
-# \li clean up \c .sconsign, \c .sconf_temp and \c config.log on
-#   <tt>scons -c all</tt>
-#
-# \ingroup target
-def StandardTargets(env):
-    env.Clean(env.Alias('all'), [ '.sconsign', '.sconf_temp', 'config.log' ])
-
-## \brief Add generic global targets
-#
-# This target helper should be called in the top-level \c SConstruct
-# file. It adds general global targets. Right now theese are
-# \li Make <tt>scons all</tt> build all targets.
-#
-# \ingroup target
-def GlobalTargets(env):
-    env.Alias('all', [ 'default', 'all_tests', 'all_docs' ])
-
 ## \brief Return path of a built library within $LOCALLIBDIR
 # \internal
 def LibPath(lib): return '${LOCALLIBDIR}/${LIBPREFIX}%s${LIBADDSUFFIX}${LIBSUFFIX}' % lib