More KVO to remove

Tweak

Fix