Remove the -map: optimisation