diff --git a/src/web/App.js b/src/web/App.js
index 232d268d..e73cbe1b 100755
--- a/src/web/App.js
+++ b/src/web/App.js
@@ -213,13 +213,6 @@ App.prototype.bakingComplete = function(response) {
     this.progress = response.progress;
     this.manager.recipe.updateBreakpointIndicator(response.progress);
     this.manager.output.set(response.result, response.type, response.duration);
-
-    // If baking took too long, disable auto-bake
-    if (response.duration > this.options.autoBakeThreshold && this.autoBake_) {
-        this.manager.controls.setAutoBake(false);
-        this.alert("Baking took longer than " + this.options.autoBakeThreshold +
-            "ms, Auto Bake has been disabled.", "warning", 5000);
-    }
 };
 
 
diff --git a/src/web/InputWaiter.js b/src/web/InputWaiter.js
index eda090b0..0d7787df 100755
--- a/src/web/InputWaiter.js
+++ b/src/web/InputWaiter.js
@@ -158,11 +158,6 @@ InputWaiter.prototype.inputDrop = function(e) {
     const CHUNK_SIZE = 20480; // 20KB
 
     const setInput = function() {
-        if (inputCharcode.length > 100000 && this.app.autoBake_) {
-            this.manager.controls.setAutoBake(false);
-            this.app.alert("Turned off Auto Bake as the input is large", "warning", 5000);
-        }
-
         this.set(inputCharcode);
         const recipeConfig = this.app.getRecipeConfig();
         if (!recipeConfig[0] || recipeConfig[0].op !== "From Hex") {
diff --git a/src/web/html/index.html b/src/web/html/index.html
index 9e92c860..540ea6e3 100755
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -302,10 +302,6 @@
                             <input type="number" option="errorTimeout" id="errorTimeout" />
                             <label for="errorTimeout"> Operation error timeout in ms (0 for never) </label>
                         </div>
-                        <div class="option-item">
-                            <input type="number" option="autoBakeThreshold" id="autoBakeThreshold"/>
-                            <label for="autoBakeThreshold"> Auto Bake threshold in ms </label>
-                        </div>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-default" id="reset-options">Reset options to default</button>
diff --git a/src/web/index.js b/src/web/index.js
index f010d73b..9085de5c 100755
--- a/src/web/index.js
+++ b/src/web/index.js
@@ -44,7 +44,6 @@ function main() {
         wordWrap:          true,
         showErrors:        true,
         errorTimeout:      4000,
-        autoBakeThreshold: 200,
         attemptHighlight:  true,
         theme:             "classic",
     };
diff --git a/src/web/stylesheets/layout/_io.css b/src/web/stylesheets/layout/_io.css
index a425edd1..79cae6a4 100644
--- a/src/web/stylesheets/layout/_io.css
+++ b/src/web/stylesheets/layout/_io.css
@@ -108,4 +108,5 @@
     margin-left: 5px;
     font-size: larger;
     font-weight: normal;
+    cursor: help;
 }