fixes for CB against develop
changed to a more logical way
Merge pull request #2250 from ofZach/cbwork_cleanup

fixes for CB against develop