CFY-718 removed dependency links