Remove import * statements in favour of more specific import statements