Merge branch 'ew/cbtree-remove-unused-and-broken-cb-unlink'

Code clean-up. * ew/cbtree-remove-unused-and-broken-cb-unlink: cbtree: remove broken and unused cb_unlink