Remove non-versioned elections

Remove use of non-versioned voting