diff --git a/src/main/java/org/openmbee/mdk/emf/EMFExporter.java b/src/main/java/org/openmbee/mdk/emf/EMFExporter.java
index 46002ce87..fbb0eb4c1 100644
--- a/src/main/java/org/openmbee/mdk/emf/EMFExporter.java
+++ b/src/main/java/org/openmbee/mdk/emf/EMFExporter.java
@@ -347,7 +347,7 @@ private enum Processor {
         ),
         TAGGEDVALUE_POST(
                 (element, project, objectNode) -> {
-                    if (!(element instanceof TaggedValue)) {
+                    if (!(element instanceof TaggedValue) || element instanceof ElementTaggedValue) {
                         return objectNode;
                     }
                     TaggedValue v = (TaggedValue)element;
diff --git a/src/main/java/org/openmbee/mdk/emf/EMFImporter.java b/src/main/java/org/openmbee/mdk/emf/EMFImporter.java
index 168191dbe..8e3abeb5f 100644
--- a/src/main/java/org/openmbee/mdk/emf/EMFImporter.java
+++ b/src/main/java/org/openmbee/mdk/emf/EMFImporter.java
@@ -130,7 +130,7 @@ public static class PreProcessor {
                 ),
                 TAGGED_VALUE = new PreProcessor(
                         (objectNode, project, strict, element) -> {
-                            if (!(element instanceof TaggedValue)) {
+                            if (!(element instanceof TaggedValue) || element instanceof ElementTaggedValue) {
                                 return element;
                             }
                             ArrayNode value = (ArrayNode)objectNode.get("value");
diff --git a/src/main/java/org/openmbee/mdk/options/ConfigureEnvironmentOptions.java b/src/main/java/org/openmbee/mdk/options/ConfigureEnvironmentOptions.java
deleted file mode 100644
index 554b2c913..000000000
--- a/src/main/java/org/openmbee/mdk/options/ConfigureEnvironmentOptions.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openmbee.mdk.options;
-
-import com.nomagic.magicdraw.core.Application;
-
-public class ConfigureEnvironmentOptions {
-
-    public ConfigureEnvironmentOptions() {}
-
-    public void configure() {
-        Application.getInstance().getEnvironmentOptions().addGroup(MDKEnvironmentOptionsGroup.getInstance());
-    }
-}