Elections clean-up

Comments