Make sure the CallbackHandler gets saved for subsequent requests
More cleanup work