Simplify remap command