Fixed unbind code to unsubscribe from notification events