Removed old commented out token-request handling