Get rid of addObserverForName:object:queue:usingBlock!

Properly handle removing observers.