Speedo and Tach restoration

I am in the process of redoing my dash cluster and am wondering while I have the gauges out what should I do to ensure years of smooth operation. Has anyone inspected and cleaned/calibrated their speedometer? What steps did you take or who did it for you?

Same question on the tach. I was planning on installing a new circuit board from RTE engineering and want the needle assembly to move freely with minimum bounce. Has anyone cleaned the needle assembly?

Thanks