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