UI-728: Remove 'tools' level in loop to delete empty options