UI-2882 clean-up ECMS old source