CFY-655 remove remains