Remove hard coded 'Subset' string checks

[rosteen]

trafficstars

Does what the title says.

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 91.54%. Comparing base (0673de8) to head (7feaf19). Report is 702 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2611   +/-   ##
=======================================
  Coverage   91.54%   91.54%           
=======================================
  Files         161      161           
  Lines       19757    19837   +80     
=======================================
+ Hits        18086    18160   +74     
- Misses       1671     1677    +6     

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[rosteen]

Closing this, as @pllim there are smarter ways to do this and we can revisit later if needed.