CFY-780 removed unused code