chore(core): code cleanup

related to CAM-2706