fix KVO removal