Fix bug on remaining data linkage when deleting (fixes historic bug on persisting events too)