ContextObserver removal, part II: Its gone