Refactored Wayf login to no longer store metadata (only id).
Some refactoring of client.