Drop obsolete imports.

These crept in after rebase.