In which unneeded imports are cleaned up