diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 0526e4dad..e038790e4 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -384,8 +384,6 @@ class Blocks extends React.Component {
             optVarType !== this.ScratchBlocks.BROADCAST_MESSAGE_VARIABLE_TYPE &&
             p.prompt.title !== this.ScratchBlocks.Msg.RENAME_VARIABLE_MODAL_TITLE &&
             p.prompt.title !== this.ScratchBlocks.Msg.RENAME_LIST_MODAL_TITLE;
-        // TODO CLOUD add flag about showing the cloud variable option, which will necessitate
-        // that the flag above is true, e.g. p.prompt.showVariableOptions && canUseCloudData
         this.setState(p);
     }
     handleConnectionModalStart (extensionId) {
diff --git a/src/lib/cloud-provider.js b/src/lib/cloud-provider.js
index e587cd671..be330af0f 100644
--- a/src/lib/cloud-provider.js
+++ b/src/lib/cloud-provider.js
@@ -45,7 +45,8 @@ class CloudProvider {
             const messageString = event.data;
             log.info(`Received websocket message: ${messageString}`);
             const message = JSON.parse(messageString);
-            this.parseMessage(message);
+            const parsedData = this.parseMessage(message);
+            this.vm.postIOData('cloud', parsedData);
         };
 
         this.connection.onopen = () => {
@@ -75,7 +76,7 @@ class CloudProvider {
             break;
         }
         }
-        this.vm.postIOData('cloud', varData);
+        return varData;
     }
 
     /**