we can probably remove api-version form this too