diff --git a/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/GenerationHandler.java b/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/GenerationHandler.java
index c6443edbb58624099fe95b50a59f80a722a490c9..f7cfb2d72bca91734f93b4a1424ca98533b280cf 100644
--- a/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/GenerationHandler.java
+++ b/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/GenerationHandler.java
@@ -1,13 +1,11 @@
 package org.etsi.mts.tdl.tools.to.docx.poi.ui.handlers;
 
-import java.io.File;
 import java.util.Arrays;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
diff --git a/plugins/org.etsi.mts.tdl.tools.to.docx.poi/src/org/etsi/mts/tdl/tools/to/docx/poi/Generator.java b/plugins/org.etsi.mts.tdl.tools.to.docx.poi/src/org/etsi/mts/tdl/tools/to/docx/poi/Generator.java
index 8462282e879e29babc900181f80c119cbf79bc5e..9fbb491620adeb22c9045c281e471456ba351dd1 100644
--- a/plugins/org.etsi.mts.tdl.tools.to.docx.poi/src/org/etsi/mts/tdl/tools/to/docx/poi/Generator.java
+++ b/plugins/org.etsi.mts.tdl.tools.to.docx.poi/src/org/etsi/mts/tdl/tools/to/docx/poi/Generator.java
@@ -1,16 +1,10 @@
 package org.etsi.mts.tdl.tools.to.docx.poi;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.CodeSource;
-import java.security.ProtectionDomain;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -30,18 +24,15 @@ import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.apache.poi.xwpf.usermodel.XWPFTableCell;
 import org.apache.poi.xwpf.usermodel.XWPFTableRow;
 import org.apache.xmlbeans.XmlException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
-import org.etsi.mts.tdl.Annotation;
 import org.etsi.mts.tdl.Behaviour;
 import org.etsi.mts.tdl.Block;
 import org.etsi.mts.tdl.CompoundBehaviour;
 import org.etsi.mts.tdl.Package;
-import org.etsi.mts.tdl.SingleCombinedBehaviour;
 import org.etsi.mts.tdl.TestConfiguration;
 import org.etsi.mts.tdl.TestDescription;
 import org.etsi.mts.tdl.resources.ResourceHandler;
@@ -49,7 +40,6 @@ import org.etsi.mts.tdl.structuredobjectives.StructuredTestObjective;
 import org.etsi.mts.tdl.structuredobjectives.TestObjectiveVariant;
 import org.etsi.mts.tdl.structuredobjectives.VariantBinding;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
-import org.osgi.framework.Bundle;
 
 public class Generator {
 
@@ -151,6 +141,7 @@ public class Generator {
 		titleRun.setText(p.getName());
 	}
 
+	//TODO: extract and reuse
 	private <T> List<T> getContentsOfType(Resource resource, Class<T> type) {
 		List<T> elements = resource.getContents()
 				.stream()