Remap Y and remove regex maps