optimize imports again