Refactor, remove 'rsp' from response.