diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt
index f8e453211..5b8928628 100644
--- a/build/shared/lib/defaults.txt
+++ b/build/shared/lib/defaults.txt
@@ -344,8 +344,10 @@ pdex.autoSave.autoSaveByDefault=true
 pdex.autoSave.autoSaveEnabled=false
 pdex.autoSave.promptDisplay=true
 pdex.autoSaveInterval=5
-pdex.ccEnabled=true
 pdex.dbgOutput=false
 pdex.errorCheckEnabled=true
 pdex.warningsEnabled=true
 pdex.writeErrorLogs=false
+
+pdex.completion = false
+pdex.completion.trigger = false
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 90c5036bf..e74c54335 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -21,6 +21,9 @@ until all those issues are sorted out.
   messages. Hopefully this will return soon.
   https://github.com/processing/processing/issues/2852
 
++ Turned off code completion by default and reset its preference name.
+
+
 [ bug fixes ] 
 
 + TGAs from saveFrame() create transparent/black movies with Movie Maker
diff --git a/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java b/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java
index 1727af6ee..a9285207a 100644
--- a/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java
+++ b/pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java
@@ -8,12 +8,8 @@ import java.util.TreeMap;
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.internal.compiler.problem.DefaultProblem;
 
-import static processing.mode.experimental.ExperimentalMode.log;
 
 public class ErrorMessageSimplifier {
-
-//  private ErrorCheckerService errorCheckerService;
-
   /**
    * Mapping between ProblemID constant and the constant name. Holds about 650
    * of them. Also, this is just temporary, will be used to find the common
diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java
index 516b437e6..1710f0455 100755
--- a/pdex/src/processing/mode/experimental/ExperimentalMode.java
+++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java
@@ -36,7 +36,6 @@ import javax.swing.ImageIcon;
 import processing.app.Base;
 import processing.app.Editor;
 import processing.app.EditorState;
-import processing.app.Library;
 import processing.app.Mode;
 import processing.app.Preferences;
 import processing.app.RunnerListener;
@@ -149,20 +148,19 @@ public class ExperimentalMode extends JavaMode {
    */
   volatile public static int codeCompletionTriggerLength = 2;
 
-  public static final String prefErrorCheck = "pdex.errorCheckEnabled",
-      prefWarnings = "pdex.warningsEnabled",
-      prefCodeCompletionEnabled = "pdex.ccEnabled",
-      prefDebugOP = "pdex.dbgOutput",
-      prefErrorLogs = "pdex.writeErrorLogs",
-      prefAutoSaveInterval = "pdex.autoSaveInterval",
-      prefAutoSave = "pdex.autoSave.autoSaveEnabled", // prefUntitledAutoSave = "pdex.autoSave.untitledAutoSaveEnabled",
-      prefAutoSavePrompt = "pdex.autoSave.promptDisplay",
-      prefDefaultAutoSave = "pdex.autoSave.autoSaveByDefault",
-      prefCCTriggerEnabled = "pdex.ccTriggerEnabled",
-      prefImportSuggestEnabled = "pdex.importSuggestEnabled";
+  static public final String prefErrorCheck = "pdex.errorCheckEnabled";
+  static public final String prefWarnings = "pdex.warningsEnabled";
+  static public final String prefCodeCompletionEnabled = "pdex.completion";
+  static public final String prefCCTriggerEnabled = "pdex.completion.trigger";
+  static public final String prefDebugOP = "pdex.dbgOutput";
+  static public final String prefErrorLogs = "pdex.writeErrorLogs";
+  static public final String prefAutoSaveInterval = "pdex.autoSaveInterval";
+  static public final String prefAutoSave = "pdex.autoSave.autoSaveEnabled";
+  static public final String prefAutoSavePrompt = "pdex.autoSave.promptDisplay";
+  static public final String prefDefaultAutoSave = "pdex.autoSave.autoSaveByDefault";
+  static public final String prefImportSuggestEnabled = "pdex.importSuggestEnabled";
 
-//  // TweakMode code (Preferences)
-  volatile public static boolean enableTweak = false;
+  static volatile public boolean enableTweak = false;
 
   public void loadPreferences() {
     log("Load PDEX prefs");
diff --git a/todo.txt b/todo.txt
index 8daea8e6b..9820b21ad 100644
--- a/todo.txt
+++ b/todo.txt
@@ -15,6 +15,7 @@ X TGAs from saveFrame() create transparent/black movies with Movie Maker
 X   https://github.com/processing/processing/issues/2851
 X fix export problem on Windows with PDE X
 X   https://github.com/processing/processing/issues/2806
+X turn off code completion by default (and reset the preference)
 
 pulls
 X Optimize creation of boxed primitives
@@ -26,6 +27,8 @@ X   https://github.com/processing/processing/pull/2844
 X black font outline appears with large VLW font and OpenGL renderer
 X   https://github.com/processing/processing/issues/2845
 X   https://github.com/processing/processing/pull/2856
+X updates to Spanish translation
+X   https://github.com/processing/processing/pull/2857
 
 cleaning
 X single line of code with no semicolon dies with "unexpected token: null"