I think we should just remap the normal idx at the end of compute, instead of having a separate `clean_id`. This remapping would only happen once, at the end of compute, so I don't think it should be too expensive