more voting cleanup