Persist OSM ids when resolving geocodes.
Removing unused trim tags code.