more cleanup for voting options