Tidied up dead imports