Comment nits and remove unneeded import.