Remove 1.7-only (and unneeded) imports