Minor refactoring. Removed Tools\ApiKeyRestore tool.