remove unneeded imports, clean up unused var warnings