Feature/cfy 718 remove dep links