remove old almanac code
use CachingPsfEx model