Tidy up Blade Class Definitions

[lrljoe]

Remove duplicate class() merging to simplify the blades

All Submissions:

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?

New Feature Submissions:

1. Does your submission pass tests and did you add any new tests needed for your feature?
2. Did you update all templates (if applicable)?
3. Did you add the relevant documentation (if applicable)?
4. Did you test locally to make sure your feature works as intended?

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you successfully ran tests with your changes locally?

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.51%. Comparing base (fe3abd6) to head (17c476c).
Report is 1 commits behind head on development.

Additional details and impacted files

@@              Coverage Diff               @@
##             development    #2145   +/-   ##
==============================================
  Coverage          90.51%   90.51%           
  Complexity          1983     1983           
==============================================
  Files                205      205           
  Lines               4490     4490           
==============================================
  Hits                4064     4064           
  Misses               426      426           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.