Get rid of some redundant imports