clean up

remove unnused imports
fix some warnings