More imports removed