pam_envoy: cleanups