More KVO to remove

I think we'd still want to call this, no?