Removed: Location store