More KVO to remove