Remove expectation logging; we'll do it via an observer pattern