Removing unused imports, fixing warnings.