Tidy up.

Remove deprecated methods, make all methods on TCUtils non-static.

src/com/dmdirc/commandparser/parsers/CommandParser.java

         loadCommands();
     }
 
-    /**
-     * @deprecated Callers should obtain their own instance of command controller.
-     *
-     * @return The command manager for this parser.
-     */
-    @Deprecated
-    public CommandController getCommandManager() {
-        return commandManager;
-    }
-
     /**
      * Sets the owner of this command parser.
      *
                 final String newCommandString = commandManager.getCommandChar()
                         + (silent ? String.valueOf(commandManager.getSilenceChar()) : "")
                         + args.getCommandName()
-                        + (cargs.length > 1 ? " " + args.getArgumentsAsString(1) : "");
+                        + (cargs.length > 1 ? ' ' + args.getArgumentsAsString(1) : "");
 
                 if (server.hasChannel(channel)) {
                     server.getChannel(channel).getCommandParser().parseCommand(origin,

src/com/dmdirc/ui/input/InputHandler.java

     /** The event bus to use to dispatch input events. */
     private final DMDircMBassador eventBus;
 
-    /** Temporary ctor to allow plugins to specify a new one. */
-    @Deprecated
-    public InputHandler(
-            final ServiceManager serviceManager,
-            final InputField target,
-            final CommandController commandController,
-            final CommandParser commandParser,
-            final FrameContainer parentWindow,
-            final DMDircMBassador eventBus) {
-        this(serviceManager, target, commandController, commandParser, parentWindow,
-                new TabCompleterUtils(), eventBus);
-    }
-
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target that we need to operate.
      *

src/com/dmdirc/ui/input/TabCompleterUtils.java

 @Singleton
 public class TabCompleterUtils {
 
+    private final CommandController commandController;
+
     @Inject
-    public TabCompleterUtils() {
+    public TabCompleterUtils(final CommandController commandController) {
+        this.commandController = commandController;
     }
 
     /**
      * @return Additional tab targets for the text, or null if none are available
      */
     @Nullable
-    public static AdditionalTabTargets getIntelligentResults(final int arg,
+    public AdditionalTabTargets getIntelligentResults(final int arg,
             final IntelligentCommand.IntelligentCommandContext context, final int offset) {
         if (arg == offset) {
             final AdditionalTabTargets targets = new AdditionalTabTargets().excludeAll();
             return targets;
         } else {
             return getIntelligentResults(context.getWindow(),
-                    new CommandArguments(context.getWindow().getCommandParser().getCommandManager(),
+                    new CommandArguments(commandController,
                             context.getPreviousArgs().subList(offset,
                                     context.getPreviousArgs().size())), context.getPartial());
         }
      * @since 0.6.4
      */
     @Nullable
-    private static AdditionalTabTargets getIntelligentResults(
+    private AdditionalTabTargets getIntelligentResults(
             final FrameContainer window,
             final CommandArguments args, final String partial) {
         if (!args.isCommand()) {
             return null;
         }
 
-        final Map.Entry<CommandInfo, Command> command = window.getCommandParser().
-                getCommandManager().getCommand(args.getCommandName());
+        final Map.Entry<CommandInfo, Command> command =
+                commandController.getCommand(args.getCommandName());
 
         AdditionalTabTargets targets = null;
 
      * @since 0.6.4
      */
     @Nullable
-    public static AdditionalTabTargets getIntelligentResults(
+    public AdditionalTabTargets getIntelligentResults(
             final FrameContainer window, final CommandController commandController,
             final String text, final String partial) {
         return getIntelligentResults(window,