diff --git a/js/app/views/PlotComponents/PlotPreviewUI.js b/js/app/views/PlotComponents/PlotPreviewUI.js
index 9073795..a849e44 100644
--- a/js/app/views/PlotComponents/PlotPreviewUI.js
+++ b/js/app/views/PlotComponents/PlotPreviewUI.js
@@ -241,7 +241,7 @@ Ext.define('amdaPlotComp.PlotPreviewUI', {
 			];
 		};
 
-		childrenOfTopToolBar.push(me.createDownloadButton(configResult));
+		// childrenOfTopToolBar.push(me.createDownloadButton(configResult)); // #10936 - Not fully tested
 
 		var topToolbar =
 		{
diff --git a/js/app/views/PlotTabResultUI.js b/js/app/views/PlotTabResultUI.js
index 9adb679..a31dfd3 100644
--- a/js/app/views/PlotTabResultUI.js
+++ b/js/app/views/PlotTabResultUI.js
@@ -220,10 +220,10 @@ Ext.define('amdaUI.PlotTabResultUI', {
 			me.contextualMenu.add('-');
 			me.contextualMenu.add(insertIntervalItem);
 		}
-		if (plotFunctionItem != null) {
+		/*if (plotFunctionItem != null) { // #9016 & #6018 - Hide - Not fully tested
 			me.contextualMenu.insert(0, '-');
 			me.contextualMenu.insert(0, plotFunctionItem);
-		}
+		}*/
 	},
 
 	getAxisValue: function (axis, pixelMin, pixelMax, pixelVal) {
--
libgit2 0.21.2