OFC-1178 When deleting a survey object, detach it correctly from the
survey