Have you tried spraying the surface connections with some electrical contact cleaner?
https://www.lowes.com/pd/CRC-Contac..._clickID=59874edf-213d-4bb8-aead-4f109661d9c7
https://www.lowes.com/pd/CRC-Contac..._clickID=59874edf-213d-4bb8-aead-4f109661d9c7