More imports cleanup