Issue 1957 remote delete structure