During Round Editing

When I need to do any edits or corrections after my round, all clubs including retired clubs show up as choices during the edit process, which makes for a lot of sideways scrolling to get to the club I mean to choose. Any way to only have the current clubs show up?  Again this is only during editing, not just clicking on the Club Performance left hand tab. That only shows current clubs, which is expected.