refactoring to recreate the PMF each time

... and discard the attempt to enhance in-memory, not required.