fix(engine/evt-subprocess): clean up code

related to #CAM-1988