removed hacks for old voter bug