Improve unsubscription logic

Created by  Nathan Jaremko  on February 24, 2019
O36J3PG32M4QSUVVZGMR6744ZBY6SSUX4653TDTRNN4JV36RVJNQC
Change contents