Some cleanups to secrets plugin