chore(engine/callActivity/variables): Cleanup code

related to CAM-1617