Remove split code
Remove split code from all locations