UI-2885 [FORUM] - Clean up OLD resources