Remove gam dependency
Retweak make push-pkg