Drop spv old code

Implementation for #4420