Cleaning up

This was removed and I “stared” and pulled down the direct Adafruit
changes.