Cleaned up the locations authorization flow