- entity clean-up