Got rid of some unneeded imports