UI-2903: [COMMON] - Clean up Old resources