Feature/cfy 718 remove dependency links