Simplify hitmanagers
Further consolidation of HitManagers and OT/ST hit cleaners
See merge request !107 (merged)