UI-2904: [INTEG] - Clean up OLD resources