avr: support for pairing button.  Clean up code that was commented out