Cleanup
More cleanup
- remove split-combine in master as it is outdated
Merge pull request #153 from juhasch/codefolding_cleanup

Cleanup