Code cleanups, removing unneeded imports