massive refactor to remove dependency on git-deploy