Cleanup of location and LocationResolver

Doing this before working on management context tracking locations...