continued cleanup of iso_distibutor