Various cleanup to configuration and binding of default secret key