Eliminate duplicate imports

This is on top of #2535 Import checker [READY TO PULL].