[v6r11] Fix deletion of old resources

(feel free to apply directly to v6r12)