Editing shots on the Garmin Golf App lists old and never used clubs

When editing shots on my Garmin Golf app, I now am getting options to select many of my old, deleted clubs and some generic placeholders for say "Sand Wedge" that I've not used. 

I now have to scroll endlessly to find the club that I actually still have in my bag that I did hit. I do not have this issue on the web based shot tracking editing - there only my active clubs show.

Checked my clubs, reinstalled the app, and reset my watch, but the issue persists.