Removing voting service and cleaning up some ;