remove one_hot, first try

Agreed, although I don't think that you need to move `k_hot`. The `merge` mode should already do exactly what `k_hot` does, no?