Touchbar custom buttons persist even after deleting related application

Issue 1
recently I added custom touchbar buttons for MS Code. I had already had a few defined for Mac Terminal. Now when I have terminal and Code open in the same Desktop, BTT puts all buttons on the strip, although they are specifically assigned to an application.

Issue 2 (related)
I deletes the application MS Code from the application list, but the buttons still persist. They won't go away with a restart of BTT, nor with a hard reset of the touchbar.