Most of the way to clean imports