prov/psm: code cleanup