Clean up one_hot_to_index