CDEC-56: code clean-up