Slimming down packageBuild branch.