Updated functionality to provide default authentication
Remove not needed variables