Use removeprefix rather than replace to avoid separator deletion

Use removeprefix rather than replace to avoid separator deletion #2617