Remove dependency from CM(or try to)