Cleanup code related to Vote