Update cf-core

- Pull in latest version of cf-core
- Remove cf-enhancements code that is now in cf-core