Cleanup. Reduce complexity.
Change auth mechanism.
Cleanup.