try to cleanup the various ways source locations are stored