Remove usage of GMap to do the base address replacement