removed xc-common merged roles