Added unwatch-on-delete functions.