Removed handling of service API keys. Changed terminology to API token.