fixups
tools: add check-imports.sh script
clean up imports