Implement unsubscribe

Change-Id: Ic45d68dc72aaecf814bad093cfe2b6c87faafec3