ENH: More Boykov removal