More KVO to remove

Tweak