Clean up
Add authentication with sorcery