Issue 2494 finish remote delete