chore: add some pub use
and remove unused imports
#8521
Merged
pub use
and remove unused imports
#8521