improve remove duplicate calls; add is_broken to calls