fix v2 requests expecting no response body
refactor