Clean up onEntityDeath