Got rid of everything except the TPL for the PBS branch.