CS for hathor

Looks to me like this whole block isn't used at all and could be removed. But not as a CS PR because it's a change in code.