General code tidying. Remove unrequired imports.