More cleanup
- remove split-combine in master as it is outdated