remove  mapper improvements