updated subscription handling to remove subscription id's when unsubscribing to stop repeatedly re-subscribing when receiving a termination callback