Simplify hitmanagers

Gerhard Ravenrequested to merge
cleanup-hitmanagers into master

Further consolidation of HitManagers and OT/ST hit cleaners

Merge request reports