HI: Code cleanup related to legislator fix.