Removing some unneeded imports