minor security tweak
Removing lingering references to static ShepherdPMF
Testing default context configuration