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

Change-Id: Ifcf8c59c7b06f7b4c408350cd29863361d64de0e