I think it's important to clean the circuit boards without creating scratches which can trap dirt and cause further wear. I only use Brasso since it cleans well without harming the bakelite surface. If the rivets are grooved severely, I will resort to reworking them. Either just smoothing them a bit, or in extreme cases, adding solder and reforming the rivet.