Remove even more old imports