Tidied up some erroneous imports