get rid of the remaining pp.* globals