chore(engine): code cleanup

related to #CAM-2435