PF predictor cleanup and tuning

Tuned a few values based on experiments with testing set.  Removed
unused code.