Cleanup, allow different authentication methods