remove one_hot, first try

I'm not sure yet (I'm still reading the code), but this might be one of the few places where `convert_to_one_hot` should be called.
I'm just putting this here as a reminder for me to resolve that question before you change it.