Credentials managers cleanup

Cleanup the code to handle them and avoid using singletons when not needed.

And a tiny fix to the smartcard token handling.