Remove extra imports that aren't needed, and don't exist in 2.2-01.

This may fix @jamlevi's latest issue.