CMA-3391 remove unnecessary code