build fixes
remove unused imports
formatting