remove a bunch of cruft
Revert "remove a bunch of cruft"

This reverts commit f8092bbc3be4028296c5f4335ea8ef758f68da43.
add secret back
Revert "Revert "remove a bunch of cruft""

This reverts commit 0e53c0ed386aa73d22b0d0c9c9182cc757da1a6c.