Removed the overhead of CandidateList
Merge pull request #3670 from systay/candidatelist-removal

Removed the overhead of CandidateList