CFY-3 remove return statement