diff --git a/docs b/docs
index fceaa247..c25a1c9e 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit fceaa2472ad82fa41968fd016d2b5ecf7d50c75e
+Subproject commit c25a1c9ec0d2cca536d3550bf4f1282169abc39f
diff --git a/examples b/examples
index c5aaf70f..a71564ab 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit c5aaf70fff038155716d4dd6a7edfc9c21b79cd1
+Subproject commit a71564ab46d27c387f17814056b659f826b7db24
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index c584d654..97072ddd 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -316,7 +316,7 @@ def BuildFrameworks(env, frameworks):
             env.Exit(1)
 
     for f in frameworks:
-        if f in ("arduino", "energia"):
+        if f == "arduino":
             # Arduino IDE appends .o the end of filename
             Builder.match_splitext = scons_patched_match_splitext
             if "nobuild" not in COMMAND_LINE_TARGETS:
diff --git a/platformio/commands/test/processor.py b/platformio/commands/test/processor.py
index d3029a34..70cec0c0 100644
--- a/platformio/commands/test/processor.py
+++ b/platformio/commands/test/processor.py
@@ -40,14 +40,6 @@ TRANSPORT_OPTIONS = {
         "begin": "pc.baud($baudrate)",
         "end": ""
     },
-    "energia": {
-        "include": "#include <Energia.h>",
-        "object": "",
-        "putchar": "Serial.write(c)",
-        "flush": "Serial.flush()",
-        "begin": "Serial.begin($baudrate)",
-        "end": "Serial.end()"
-    },
     "espidf": {
         "include": "#include <stdio.h>",
         "object": "",