Minor imports cleanup