- some more cleanup
- integrated authentication client