Reorder imports and remove unused ones