More cleanup, GET and Observe