cleanup, process events like instrument drivers

Change-Id: Ic762ec6e0cbff3d9451102b1465b0698c7502b07