Removed unused imports + tidy-up.