Clean up auth handling. And so much more