resolve rebase issues
remove unused imports
get rid of boot module