Remove dependence further on config_manager and bzr