clean up imports
tidy up warnings and android lint