Refactoring - cleaning up remaining references

to votes (#226).