cleanup the bluebird stuff and make a few libraries happy