removing abominations from IncrementVotableVersion()

+other cleanup, deleting redundant code