UI-2886: [SOCIAL] - Clean up OLD resources - updates v2