Cleanup Secrets config
Got modular helpers working.