More complete implementation of EntityDeletedImpl, see the TODO item in there for next steps.