Him core cleanup

Cleanup of the HIM-core codebase