CFY-3 remove unused code