remove unneeded imports
more android studio auto fixes