Delete on unregister (bug #527)