better support for generic deletion