remove and re-add via set and small cleanup