Removing API keys from discovery and client level. Fixing lint errors.