made unsubscribe a little smarter