Tidy up unused imports and fields