refactor: simplify and remove unused code

Giordon Holtsberg Starkrequested to merge
refactor/deadCode into devel-2.2

Resolves #72 (closed).

Merge request reports