[WIP] Drop spv old code

WIP for #4420