And clear up the deprecated stuff.

Change-Id: I420b85eaaaaaaaaaabbbb5fe18411fa18d994011
Reviewed-on: http://gerrit.dmdirc.com/3030
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>