More pam clean up.