Updated changes for new Flambe version:
- Use the CatapultClient's.
- Removed obsolete code.
Package changes.