Fixed an import error, misc unused import fixes