diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx
index 058d11031d1..6436da7d3d2 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ConfigEditor.tsx
@@ -123,11 +123,7 @@ export class ConfigEditor extends PureComponent<Props, State> {
   };
 
   render() {
-    // TODO: Clean up
     const { options } = this.props;
-    options.jsonData.cloudName = options.jsonData.cloudName || 'azuremonitor';
-    // This is bad, causes so many messy typing issues everwhere..
-    options.secureJsonData = (options.secureJsonData || {}) as AzureDataSourceSecureJsonData;
 
     return (
       <>