Cleanup voting biz. in prep. for new format