Fix import * by removing and being more specific