CFY-781 removed unnecessary variables