Drop obsolete imports.

These crept in after rebase.
Merge pull request #465 from square/jwilson_0119_imports

Drop obsolete imports.