diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm b/Netdisco/lib/App/Netdisco/Daemon/Util.pm
similarity index 81%
rename from Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm
rename to Netdisco/lib/App/Netdisco/Daemon/Util.pm
index 4853ad3f..a807e181 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Util.pm
@@ -1,4 +1,4 @@
-package App::Netdisco::Daemon::Worker::Interactive::Util;
+package App::Netdisco::Daemon::Util;
 
 # support utilities for Daemon Actions
 
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm
index 70362313..af3e02a0 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm
@@ -1,8 +1,8 @@
 package App::Netdisco::Daemon::Worker::Interactive::DeviceActions;
 
-use App::Netdisco::Util::SNMP ':all';
+use App::Netdisco::Util::SNMP 'snmp_connect_rw';
 use App::Netdisco::Util::Device 'get_device';
-use App::Netdisco::Daemon::Worker::Interactive::Util ':all';
+use App::Netdisco::Daemon::Util ':all';
 
 use Role::Tiny;
 use namespace::clean;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
index 1e0c0e48..5d868c22 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
@@ -1,8 +1,8 @@
 package App::Netdisco::Daemon::Worker::Interactive::PortActions;
 
-use App::Netdisco::Util::SNMP ':all';
 use App::Netdisco::Util::Port ':all';
-use App::Netdisco::Daemon::Worker::Interactive::Util ':all';
+use App::Netdisco::Util::SNMP 'snmp_connect_rw';
+use App::Netdisco::Daemon::Util ':all';
 
 use Role::Tiny;
 use namespace::clean;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
index 8c8e1b6e..d6c3dd25 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
@@ -6,7 +6,7 @@ use Dancer::Plugin::DBIC 'schema';
 use App::Netdisco::Util::SNMP 'snmp_connect';
 use App::Netdisco::Util::Device 'get_device';
 use App::Netdisco::Util::DiscoverAndStore ':all';
-use App::Netdisco::Daemon::Worker::Interactive::Util ':all';
+use App::Netdisco::Daemon::Util ':all';
 
 use NetAddr::IP::Lite ':lower';