No more consistency error on unexpected reponse + cleanup