Reduce code duplication in incrementation
Cleanup in entity death