Small refactoring
Handle remote and local deletions with events