Removed redundant parts of vote generation from parser