Merge "Remove some more dead-code from old split impl" into rvc-dev