Make field query async. Remove packages from repo from now on.
Merge with origin