Remove materialized from witness_votes processing loop, small lint adjustments