Cleanup and split import.