--- a/plugins/mod_admin_adhoc.lua	Sat Mar 23 01:27:16 2013 +0100
+++ b/plugins/mod_admin_adhoc.lua	Sat Mar 23 01:27:38 2013 +0100
@@ -10,8 +10,7 @@
 local hosts = prosody.hosts;
 local t_concat = table.concat;
 
-local iterators = require "util.iterators";
-local keys, values = iterators.keys, iterators.values;
+local keys = require "util.iterators".keys;
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
 local usermanager_delete_user = require "core.usermanager".delete_user;
@@ -19,9 +18,8 @@
 local usermanager_set_password = require "core.usermanager".set_password;
 local hostmanager_activate = require "core.hostmanager".activate;
 local hostmanager_deactivate = require "core.hostmanager".deactivate;
-local is_admin = require "core.usermanager".is_admin;
 local rm_load_roster = require "core.rostermanager".load_roster;
-local st, jid, uuid = require "util.stanza", require "util.jid", require "util.uuid";
+local st, jid = require "util.stanza", require "util.jid";
 local timer_add_task = require "util.timer".add_task;
 local dataforms_new = require "util.dataforms".new;
 local array = require "util.array";

--- a/plugins/mod_http_errors.lua	Sat Mar 23 01:27:16 2013 +0100
+++ b/plugins/mod_http_errors.lua	Sat Mar 23 01:27:38 2013 +0100
@@ -2,7 +2,6 @@
 
 local server = require "net.http.server";
 local codes = require "net.http.codes";
-local termcolours = require "util.termcolours";
 
 local show_private = module:get_option_boolean("http_errors_detailed", false);
 local always_serve = module:get_option_boolean("http_errors_always_show", true);

--- a/plugins/mod_motd.lua	Sat Mar 23 01:27:16 2013 +0100
+++ b/plugins/mod_motd.lua	Sat Mar 23 01:27:38 2013 +0100
@@ -13,7 +13,6 @@
 
 if not motd_text then return; end
 
-local jid_join = require "util.jid".join;
 local st = require "util.stanza";
 
 motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config

--- a/plugins/mod_private.lua	Sat Mar 23 01:27:16 2013 +0100
+++ b/plugins/mod_private.lua	Sat Mar 23 01:27:38 2013 +0100
@@ -9,7 +9,6 @@
 
 local st = require "util.stanza"
 
-local jid_split = require "util.jid".split;
 local datamanager = require "util.datamanager"
 
 module:add_feature("jabber:iq:private");

--- a/plugins/mod_register.lua	Sat Mar 23 01:27:16 2013 +0100
+++ b/plugins/mod_register.lua	Sat Mar 23 01:27:38 2013 +0100
@@ -7,7 +7,6 @@
 --
 
 
-local hosts = _G.hosts;
 local st = require "util.stanza";
 local datamanager = require "util.datamanager";
 local dataform_new = require "util.dataforms".new;