Clean up handling of API v7 requests