UI-2882 [ECMS] - Clean up OLD resource