Eliminate warnings
remove unused imports