Removing lingering references to static ShepherdPMF