diff --git a/Netdisco/Changes b/Netdisco/Changes
index 2278ebd1..fd37bdc4 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -10,6 +10,7 @@
 
   * Use daterange for IP Subnets (same as IP Inventory)
   * Run daemons as target binary's owning user (supports run control)
+  * Clean up library path fiddling across all scripts
 
   [BUG FIXES]
 
diff --git a/Netdisco/bin/nd-dbic-versions b/Netdisco/bin/nd-dbic-versions
index 92697423..edfbe253 100755
--- a/Netdisco/bin/nd-dbic-versions
+++ b/Netdisco/bin/nd-dbic-versions
@@ -1,5 +1,8 @@
 #!/usr/bin/env perl
 
+use strict;
+use warnings;
+
 use FindBin;
 FindBin::again();
 use Path::Class 'dir';
diff --git a/Netdisco/bin/nd-import-topology b/Netdisco/bin/nd-import-topology
index 8d6bd182..4efe218e 100755
--- a/Netdisco/bin/nd-import-topology
+++ b/Netdisco/bin/nd-import-topology
@@ -1,11 +1,29 @@
 #!/usr/bin/env perl
 
-use FindBin;
-FindBin::again();
-use Path::Class 'dir';
+use strict;
+use warnings;
+
+our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
 BEGIN {
-  # stuff useful locations into @INC
+  use FindBin;
+  FindBin::again();
+
+  # try to find a localenv if one isn't already in place.
+  if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
+      use File::Spec;
+      my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv');
+      exec($localenv, $0, @ARGV) if -f $localenv;
+      $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
+      exec($localenv, $0, @ARGV) if -f $localenv;
+
+      die "Sorry, can't find libs required for App::Netdisco.\n"
+        if !exists $ENV{PERLBREW_PERL};
+  }
+
+  use Path::Class;
+
+  # stuff useful locations into @INC and $PATH
   unshift @INC,
     dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
     dir($FindBin::RealBin, 'lib')->stringify;
diff --git a/Netdisco/bin/netdisco-daemon b/Netdisco/bin/netdisco-daemon
index 066843f3..37764b2f 100755
--- a/Netdisco/bin/netdisco-daemon
+++ b/Netdisco/bin/netdisco-daemon
@@ -27,6 +27,9 @@ BEGIN {
   unshift @INC,
     dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
     dir($FindBin::RealBin, 'lib')->stringify;
+
+  use Config;
+  $ENV{PATH} = $FindBin::RealBin . $Config{path_sep} . $ENV{PATH};
 }
 
 use Daemon::Control;
diff --git a/Netdisco/bin/netdisco-daemon-fg b/Netdisco/bin/netdisco-daemon-fg
index 7009f841..ef46edda 100755
--- a/Netdisco/bin/netdisco-daemon-fg
+++ b/Netdisco/bin/netdisco-daemon-fg
@@ -14,10 +14,9 @@ BEGIN {
     dir($FindBin::RealBin, 'lib')->stringify;
 }
 
-# for netdisco app config
 use App::Netdisco;
 use Dancer qw/:moose :script/;
-info "App::Netdisco version $App::Netdisco::VERSION daemon loaded.";
+warning sprintf "App::Netdisco %s backend", ($App::Netdisco::VERSION || 'HEAD');
 
 # callbacks and local job queue management
 use App::Netdisco::Daemon::Queue ':all';
diff --git a/Netdisco/bin/netdisco-db-deploy b/Netdisco/bin/netdisco-db-deploy
index cfeb3245..455e9d32 100755
--- a/Netdisco/bin/netdisco-db-deploy
+++ b/Netdisco/bin/netdisco-db-deploy
@@ -1,14 +1,35 @@
 #!/usr/bin/env perl
 
-use FindBin;
-FindBin::again();
-use Path::Class 'dir';
+use strict;
+use warnings;
+
+our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
 BEGIN {
-  # stuff useful locations into @INC
+  use FindBin;
+  FindBin::again();
+
+  # try to find a localenv if one isn't already in place.
+  if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
+      use File::Spec;
+      my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv');
+      exec($localenv, $0, @ARGV) if -f $localenv;
+      $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
+      exec($localenv, $0, @ARGV) if -f $localenv;
+
+      die "Sorry, can't find libs required for App::Netdisco.\n"
+        if !exists $ENV{PERLBREW_PERL};
+  }
+
+  use Path::Class;
+
+  # stuff useful locations into @INC and $PATH
   unshift @INC,
     dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
     dir($FindBin::RealBin, 'lib')->stringify;
+
+  use Config;
+  $ENV{PATH} = $FindBin::RealBin . $Config{path_sep} . $ENV{PATH};
 }
 
 use App::Netdisco;
diff --git a/Netdisco/bin/netdisco-deploy b/Netdisco/bin/netdisco-deploy
index 1488fefe..8ef43626 100755
--- a/Netdisco/bin/netdisco-deploy
+++ b/Netdisco/bin/netdisco-deploy
@@ -1,11 +1,15 @@
 #!/usr/bin/env perl
 
-our $home;
+use strict;
+use warnings;
+
+our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
 BEGIN {
-  # try really hard to find a localenv if one isn't already in place.
-  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+  use FindBin;
+  FindBin::again();
 
+  # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
       my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv');
@@ -16,22 +20,16 @@ BEGIN {
       die "Sorry, can't find libs required for App::Netdisco.\n"
         if !exists $ENV{PERLBREW_PERL};
   }
-}
 
-use FindBin;
-FindBin::again();
-use Path::Class;
+  use Path::Class;
 
-BEGIN {
   # stuff useful locations into @INC and $PATH
-  my $location = $FindBin::RealBin;
-
   unshift @INC,
-    dir($location)->parent->subdir('lib')->stringify,
-    dir($location, 'lib')->stringify;
+    dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
+    dir($FindBin::RealBin, 'lib')->stringify;
 
   use Config;
-  $ENV{PATH} = $location . $Config{path_sep} . $ENV{PATH};
+  $ENV{PATH} = $FindBin::RealBin . $Config{path_sep} . $ENV{PATH};
 }
 
 use App::Netdisco;
@@ -39,7 +37,7 @@ use Dancer ':script';
 use Dancer::Plugin::DBIC 'schema';
 use Dancer::Plugin::Passphrase;
 
-info "App::Netdisco version $App::Netdisco::VERSION loaded.";
+info "App::Netdisco $App::Netdisco::VERSION loaded.";
 
 use 5.010_000;
 use Term::UI;
diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do
index 12e5e1ba..79c2ce2c 100755
--- a/Netdisco/bin/netdisco-do
+++ b/Netdisco/bin/netdisco-do
@@ -1,11 +1,12 @@
 #!/usr/bin/env perl
 
-our $home;
+our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
 BEGIN {
-  # try to find a localenv if one isn't already in place.
-  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+  use FindBin;
+  FindBin::again();
 
+  # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
       my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv');
@@ -16,14 +17,10 @@ BEGIN {
       die "Sorry, can't find libs required for App::Netdisco.\n"
         if !exists $ENV{PERLBREW_PERL};
   }
-}
 
-use FindBin;
-FindBin::again();
-use Path::Class 'dir';
+  use Path::Class;
 
-BEGIN {
-  # stuff useful locations into @INC
+  # stuff useful locations into @INC and $PATH
   unshift @INC,
     dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
     dir($FindBin::RealBin, 'lib')->stringify;
diff --git a/Netdisco/bin/netdisco-rancid-export b/Netdisco/bin/netdisco-rancid-export
index 95243d6c..33f90f61 100755
--- a/Netdisco/bin/netdisco-rancid-export
+++ b/Netdisco/bin/netdisco-rancid-export
@@ -1,11 +1,12 @@
 #!/usr/bin/env perl
 
-our $home;
+our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
 BEGIN {
-  # try really hard to find a localenv if one isn't already in place.
-  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+  use FindBin;
+  FindBin::again();
 
+  # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
       my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv');
@@ -16,22 +17,16 @@ BEGIN {
       die "Sorry, can't find libs required for App::Netdisco.\n"
         if !exists $ENV{PERLBREW_PERL};
   }
-}
 
-use FindBin;
-FindBin::again();
-use Path::Class;
+  use Path::Class;
 
-BEGIN {
   # stuff useful locations into @INC and $PATH
-  my $location = $FindBin::RealBin;
-
   unshift @INC,
-    dir($location)->parent->subdir('lib')->stringify,
-    dir($location, 'lib')->stringify;
+    dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
+    dir($FindBin::RealBin, 'lib')->stringify;
 
   use Config;
-  $ENV{PATH} = $location . $Config{path_sep} . $ENV{PATH};
+  $ENV{PATH} = $FindBin::RealBin . $Config{path_sep} . $ENV{PATH};
 }
 
 use App::Netdisco;
diff --git a/Netdisco/bin/netdisco-web b/Netdisco/bin/netdisco-web
index 9a197291..49535ac3 100755
--- a/Netdisco/bin/netdisco-web
+++ b/Netdisco/bin/netdisco-web
@@ -27,6 +27,9 @@ BEGIN {
   unshift @INC,
     dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
     dir($FindBin::RealBin, 'lib')->stringify;
+
+  use Config;
+  $ENV{PATH} = $FindBin::RealBin . $Config{path_sep} . $ENV{PATH};
 }
 
 use Daemon::Control;
diff --git a/Netdisco/bin/netdisco-web-fg b/Netdisco/bin/netdisco-web-fg
index de83321a..f0d53bf7 100755
--- a/Netdisco/bin/netdisco-web-fg
+++ b/Netdisco/bin/netdisco-web-fg
@@ -22,7 +22,7 @@ BEGIN {
 
 use App::Netdisco;
 use Dancer;
-debug sprintf "App::Netdisco %s", ($App::Netdisco::VERSION || 'HEAD');
+warning sprintf "App::Netdisco %s web", ($App::Netdisco::VERSION || 'HEAD');
 
 my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 set(session_dir => dir($home, 'netdisco-web-sessions')->stringify);