Tidied a couple of unused imports