Fix redundant imports