Rename mpoint to 'location'

Also remove an unused import