UI-2862 [ECMS] - Clean up OLD resource