problems found when fixing unit tests; preven NPE in heatmap with invalid base witness. allow sets that have been tokenized to be deleted