simplify the final remap