Cleanup.
Improved public key configuration.