Cleanup- mostly removing 'server' parameters now that I know that Bukkit.getServer() exists.