Tidied up some superfluous imports.