refactor: clean up unused code

[pamburus]

This cleans up the unused code introduced in #957.
It also amends #907.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.18%. Comparing base (a1f0eb6) to head (473daff).
Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #958      +/-   ##
==========================================
+ Coverage   83.16%   83.18%   +0.01%     
==========================================
  Files          47       47              
  Lines       13282    13279       -3     
==========================================
  Hits        11046    11046              
+ Misses       2236     2233       -3     

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.