Multiple pam_chos cleanups