Cleaned up Authentication.