Removed API keys
Merged from origin