diff --git a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java
index 811700d31..1896f7d6d 100755
--- a/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java
+++ b/src/main/java/fr/inria/corese/core/sparql/triple/parser/ASTQuery.java
@@ -20,7 +20,6 @@
 import fr.inria.corese.core.sparql.triple.cst.RDFS;
 import fr.inria.corese.core.sparql.triple.printer.SPIN;
 import fr.inria.corese.core.sparql.triple.update.ASTUpdate;
-import fr.inria.corese.core.sparql.compiler.java.JavaCompiler;
 import fr.inria.corese.core.kgram.api.core.ExprType;
 import fr.inria.corese.core.kgram.api.query.ASTQ;
 import fr.inria.corese.core.kgram.core.Mappings;
@@ -30,7 +29,6 @@
 import fr.inria.corese.core.sparql.triple.function.script.TryCatch;
 import fr.inria.corese.core.sparql.triple.parser.Access.Level;
 import fr.inria.corese.core.sparql.triple.parser.context.ContextLog;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
@@ -208,7 +206,8 @@ public class ASTQuery
     List<Atom> adescribe = new ArrayList<>();
     List<Variable> stack = new ArrayList<>(); // bound variables
     private List<Service> serviceExpList = new ArrayList<>();
-    List<String> vinfo;
+    /* --- dead code removal ---
+    List<String> vinfo; */
     List<String> errors;
     Values values;
     List<Boolean> reverseTable = new ArrayList<>();
@@ -245,10 +244,12 @@ public class ASTQuery
     private final List<Triple> tripleList;
     private List<Triple> pathList;
     private fr.inria.corese.core.kgram.core.Query updateQuery;
-    private AccessRight accessRight;
+/* --- dead code removal ---
+    private AccessRight accessRight; */
     private ASTSelector astSelector;
 
 
+/* --- dead code removal ---
     public boolean isUserQuery() {
         Context c = getContext();
         if (c == null) {
@@ -256,6 +257,7 @@ public boolean isUserQuery() {
         }
         return c.isUserQuery();
     }
+ --- dead code removal --- */
     
     public Level getLevel() {
         if (getContext() == null) {
@@ -311,9 +313,11 @@ public HashMap<String, Expression> getUndefined() {
     }
 
     
+/* --- dead code removal ---
     public void setUndefined(HashMap<String, Expression> undefined) {
         this.undefined = undefined;
     }
+ --- dead code removal --- */
 
     
     public boolean isFail() {
@@ -326,9 +330,11 @@ public void setFail(boolean isFail) {
     }
 
     
+/* --- dead code removal ---
     public boolean isRelax() {
         return isRelax;
     }
+ --- dead code removal --- */
 
     
     public void setRelax(boolean isRelax) {
@@ -388,11 +394,13 @@ public static ASTQuery create() {
         return new ASTQuery();
     }
 
+/* --- dead code removal ---
     public static ASTQuery create(Exp exp) {
         ASTQuery ast = new ASTQuery();
         ast.setBody(exp);
         return ast;
     }
+ --- dead code removal --- */
 
     /**
      * AST for a subquery share prefix declaration
@@ -483,13 +491,17 @@ public boolean isDeleteData() {
         return isDeleteData;
     }
 
+/* --- dead code removal ---
     public boolean isValidate() {
         return validate;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setValidate(boolean b) {
         validate = b;
     }
+ --- dead code removal --- */
 
     /**
      * collect var for select * check scope for BIND(exp as var) and select exp
@@ -592,17 +604,21 @@ public void createDataBlank() {
         dataBlank = new HashMap<>();
     }
 
+/* --- dead code removal ---
     public HashMap<String, Atom> getDataBlank() {
         return dataBlank;
     }
+ --- dead code removal --- */
 
    
+/* --- dead code removal ---
     public void addInfo(String info) {
         if (vinfo == null) {
             vinfo = new ArrayList<>(1);
         }
         vinfo.add(info);
     }
+ --- dead code removal --- */
 
     public void addFail(boolean b) {
         getGlobalAST().setFail(b);
@@ -616,9 +632,11 @@ public void addError(String error) {
         getGlobalAST().setError(error);
     }
 
+/* --- dead code removal ---
     public void addError(String error, Object obj) {
         getGlobalAST().setError(error + obj);
     }
+ --- dead code removal --- */
 
     void undefined(Expression t) {
         if (!getGlobalAST().getDefine().isDefined(t)) {
@@ -639,6 +657,7 @@ public List<String> getErrors() {
         return getGlobalAST().errors();
     }
     
+/* --- dead code removal ---
     public String getErrorString() {
         StringBuilder sb = new StringBuilder();
         for (String str : getErrors()){
@@ -646,6 +665,7 @@ public String getErrorString() {
         }
         return sb.toString();
     }
+ --- dead code removal --- */
     
     public String getUpdateTitle() {
         if (isInsert()) {
@@ -675,9 +695,11 @@ List<String> errors() {
         return errors;
     }
 
+/* --- dead code removal ---
     public void setConnex(boolean connex) {
         this.connex = connex;
     }
+ --- dead code removal --- */
 
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -691,29 +713,41 @@ public void setStrictDistinct(boolean strictDistinct) {
         this.strictDistinct = strictDistinct;
     }
 
+/* --- dead code removal ---
     public boolean isStrictDistinct() {
         return strictDistinct;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setRDF(boolean rdf) {
         this.rdf = rdf;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setJSON(boolean b) {
         isJSON = b;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public boolean isJSON() {
         return isJSON;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setMaxDisplay(int maxDisplay) {
         MaxDisplay = maxDisplay;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setMaxProjection(int maxProjection) {
         MaxProjection = maxProjection;
     }
+ --- dead code removal --- */
 
     public void setMaxResult(int maxResult) {
         MaxResult = maxResult;
@@ -743,17 +777,21 @@ public List<Atom> getRelax() {
         return relax;
     }
 
+/* --- dead code removal ---
     public void setOne(boolean one) {
         this.one = one;
     }
+ --- dead code removal --- */
 
     public void setDistance(String dist) {
         distance = dist;
     }
 
+/* --- dead code removal ---
     public String getDistance() {
         return distance;
     }
+ --- dead code removal --- */
 
     public void setRule(boolean rule) {
         this.rule = rule;
@@ -777,9 +815,11 @@ public void setText(String text) {
         this.text = text;
     }
 
+/* --- dead code removal ---
     public void setThreshold(float threshold) {
         Threshold = threshold;
     }
+ --- dead code removal --- */
 
     public boolean isConnex() {
         return connex;
@@ -797,9 +837,11 @@ public boolean isRDF() {
         return rdf;
     }
 
+/* --- dead code removal ---
     public int getMaxDisplay() {
         return MaxDisplay;
     }
+ --- dead code removal --- */
 
     public int getMaxProjection() {
         return MaxProjection;
@@ -817,13 +859,17 @@ public boolean isMore() {
         return more;
     }
 
+/* --- dead code removal ---
     public void setLoad(boolean b) {
         isLoad = b;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public boolean isLoad() {
         return isLoad;
     }
+ --- dead code removal --- */
 
     /**
      * NS Manager
@@ -861,12 +907,14 @@ public void setDefaultBase(String ns) {
 //        return query;
 //    }
 
+/* --- dead code removal ---
     public Exp getExtBody() {
 //        if (query != null) {
 //            return query;
 //        }
         return getBody();
     }
+ --- dead code removal --- */
 
     public boolean isRule() {
         return rule;
@@ -952,17 +1000,21 @@ public String getText() {
         return text;
     }
 
+/* --- dead code removal ---
     public float getThreshold() {
         return Threshold;
     }
+ --- dead code removal --- */
 
     /**
      * created for the new parser
      */
+/* --- dead code removal ---
     public static Term createRegExp(Expression exp) {
         Term term = Term.function(REGEX, exp);
         return term;
     }
+ --- dead code removal --- */
 
     boolean checkBlank(Expression exp) {
         if (exp.isBlankNode()) {
@@ -1137,9 +1189,11 @@ public void setMetadata(Metadata m) {
          metadata = m;
     }
     
+/* --- dead code removal ---
     public void setMetadata(Metadata.Type type) {
         getCreateMetadata().add(type);
     }
+ --- dead code removal --- */
     
     public void setAnnotation(Metadata m){
          if (m != null) {
@@ -1171,17 +1225,21 @@ public Metadata getCreateMetadata() {
         return getMetadata();
     }
     
+/* --- dead code removal ---
     public boolean isFederateIndex() {
         if (hasMetadata(Metadata.Type.INDEX)) {
             return true;
         }
         return !getDataset().getIndex().isEmpty();
     }
+ --- dead code removal --- */
     
+/* --- dead code removal ---
     public boolean isFederate() {
         return getGlobalAST().hasMetadata(Metadata.Type.FEDERATE)
             || getGlobalAST().hasMetadata(Metadata.Type.FEDERATION);
     }
+ --- dead code removal --- */
 
     // hasMetadata functions for string value only
     // not for other datatype value such as number, boolean
@@ -1189,9 +1247,11 @@ public boolean hasMetadata(Metadata.Type type) {
         return getMetadata() != null && getMetadata().hasMetadata(type);
     }
     
+/* --- dead code removal ---
     public boolean hasMetadata(String... type) {
         return metadata != null && metadata.hasMetadata(type);
     }
+ --- dead code removal --- */
     
     @Override
     public boolean hasMetadata(String type) {
@@ -1324,9 +1384,11 @@ public TryCatch defTryCatch(Expression e1, Variable var, Expression e2) {
         return new TryCatch(e1, let);
     }
     
+/* --- dead code removal ---
     public Term defThrow(Expression exp) {
         return Term.function(Processor.THROW, exp);
     }
+ --- dead code removal --- */
        
     
     /**
@@ -1353,6 +1415,7 @@ void processMap(Term term) {
      * aggregate(?x, xt:mediane(?y))
      * TODO: fix it as above
      */
+/* --- dead code removal ---
     void processAggregate(Term term) {
         if (term.getArgs().size() == 2) {
             Expression rst = term.getArg(1);
@@ -1364,6 +1427,7 @@ void processAggregate(Term term) {
             }
         }
     }
+ --- dead code removal --- */
     
       int arity(Term t){
           if (t.getLabel().equals(Processor.REDUCE)){
@@ -1380,6 +1444,7 @@ boolean isDefined(String uri){
      * exp = exists { select where }
      * use case: let (select where)
      */
+/* --- dead code removal ---
     void complete(ExpressionList lvar, Expression exp, boolean nest) {
         if (lvar.isEmpty() && ! lvar.isNested() && exp.isTerm()) {
             Exp query = exp.getTerm().getExistContent();
@@ -1394,6 +1459,7 @@ void complete(ExpressionList lvar, Expression exp, boolean nest) {
             }
         }
     }
+ --- dead code removal --- */
     
     /**
      * exp = exists { select where }
@@ -1465,9 +1531,11 @@ public Let let(List<Expression> el, Expression body, boolean dynamic) {
         return getFactory().let(el, body, dynamic);
     }
     
+/* --- dead code removal ---
     public List<Expression> defLetList(Variable var, Constant type, Expression exp) {
         return getFactory().defLetList(var, type, exp);
     }
+ --- dead code removal --- */
     
     public Term defLet(Variable var, Constant type, Expression exp) {
         return getFactory().defLet(var, type, exp);
@@ -1487,10 +1555,12 @@ public Term defLoop(ExpressionList lvar, Expression exp, Expression body) {
         return defLoop(var, exp, getFactory().createLet(getFactory().defLet(lvar, var), body, false));
     }
     
+/* --- dead code removal ---
     public void exportFunction(Expression def) {
         def.getArg(0).setPublic(true);
         def.setPublic(true);
     }
+ --- dead code removal --- */
     
     public Term createFunction(Constant name) {
         Term term = createFunction(name.getName(), name.getLongName());
@@ -1561,12 +1631,14 @@ public Term createFunction(String name, ArrayList<Expression> args) throws Engin
     }
     
  
+/* --- dead code removal ---
     public Term createReturn(Expression exp) {
         Term term = createFunction(Processor.RETURN);
         term.setCName(Constant.createResource(Processor.RETURN));
         term.add(exp);
         return term;
     }
+ --- dead code removal --- */
        
      /**
      * mapfun(st:concat, us:cell, ?list) 
@@ -1617,9 +1689,11 @@ public Constant createLDSList(IDatatype dt){
         return Constant.create(dt);
     }
     
+/* --- dead code removal ---
     public RDFList createRDFList(List<Atom> list) {
         return createRDFList(list, L_DEFAULT);
     }
+ --- dead code removal --- */
     
      /**
      * Create an RDF List (rdf:first/rdf:rest) if close = true, end by rdf:nil
@@ -1716,22 +1790,28 @@ Term list() {
                 createQName(RDFS.qrdfFirst));
     }
 
+/* --- dead code removal ---
     static Term createTerm(String s) {
         Term term = new Term(s);
         return term;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public Term createGet(Expression exp, int n) {
         return Term.function("get", exp, Constant.create(n));
     }
+ --- dead code removal --- */
 
     public static Variable createVariable(String s) {
         return Variable.create(s);
     }
     
+/* --- dead code removal ---
     public Variable createVariable() {
         return Variable.create("?_var_" + nbvar++);
     }
+ --- dead code removal --- */
 
     public static Variable createVariable(String s, ASTQuery aq) {
         Variable var = createVariable(s);
@@ -1795,9 +1875,11 @@ Constant createExpProperty(Expression e) {
         return cst;
     }
     
+/* --- dead code removal ---
     public Triple createTriple(Atom predicate, List<Atom> list) {
         return createTriple(predicate, list, false);
     }
+ --- dead code removal --- */
 
     public Triple createTriple(Atom predicate, List<Atom> list, boolean nested) {
         Triple t = createTriple(list.get(0), predicate, list.get(1));
@@ -1861,9 +1943,11 @@ public void leaveService() {
         getGlobalAST().setSubmitTriple(true);
     }
     
+/* --- dead code removal ---
     public boolean hasUndefinedService() {
         return getBody().hasUndefinedService();
     }
+ --- dead code removal --- */
     
     void submit(Triple t) {
         if (getGlobalAST().isSubmitTriple()) {
@@ -2082,10 +2166,12 @@ Term sequence(Expression e1, Expression e2) {
         return Term.create(Term.RE_SEQ, e1, e2);
     }
 
+/* --- dead code removal ---
     Expression alter(Expression e1, Expression e2) {
         return Term.create(Term.RE_ALT, e1, e2);
 
     }
+ --- dead code removal --- */
 
     public Expression createOperator(String s1, String s2, Expression exp) {
         int n1 = 0, n2 = Integer.MAX_VALUE;
@@ -2107,9 +2193,11 @@ Term createOperator(int n1, int n2, Expression exp) {
         return t;
     }
 
+/* --- dead code removal ---
     public Constant createConstant(String s, String datatype) {
         return createConstant(s, datatype, null);
     }
+ --- dead code removal --- */
 
     // Literal
     public Constant createConstant(String s, String datatype, String lang) {
@@ -2176,21 +2264,27 @@ public void setCheck(boolean b) {
         isCheck = b;
     }
 
+/* --- dead code removal ---
     public boolean isNosort() {
         return nosort;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setNosort(boolean b) {
         nosort = b;
     }
+ --- dead code removal --- */
 
     public boolean isSorted() {
         return sorted;
     }
 
+/* --- dead code removal ---
     public void setSorted(boolean b) {
         sorted = b;
     }
+ --- dead code removal --- */
 
     public int getOffset() {
         return Offset;
@@ -2212,9 +2306,11 @@ public void setWhere(boolean b) {
         where = b;
     }
 
+/* --- dead code removal ---
     public boolean isWhere() {
         return where;
     }
+ --- dead code removal --- */
 
     public long getNbBNode() {
         nbBNode++;
@@ -2233,9 +2329,11 @@ public Variable newBlankNode() {
         return newBlankNode(BNVAR + getNbBNode());
     }
     
+/* --- dead code removal ---
     public Constant createBlankNode() {
         return Constant.createBlank("_:bb" + nbbnode++);
     }
+ --- dead code removal --- */
     
     public Constant createTripleReference() {
         return Constant.createTripleReference("_:bb" + nbbnode++);
@@ -2299,9 +2397,11 @@ public Variable newBlankNode(Exp exp, String label) {
      * @param var1
      * @param var2
      */
+/* --- dead code removal ---
     public void addVariable(Variable var1, Variable var2) {
         var1.addVariable(var2);
     }
+ --- dead code removal --- */
 
 
     public void setDescribe(Atom at) {
@@ -2327,9 +2427,11 @@ boolean isDescribeAll() {
     }
 
 
+/* --- dead code removal ---
     public boolean isSPARQLCompliant() {
         return isSPARQLCompliant;
     }
+ --- dead code removal --- */
 
     public void setSPARQLCompliant(boolean b) {
         isSPARQLCompliant = b;
@@ -2493,11 +2595,13 @@ public ASTQuery acopy() {
      ***********************************************************
      */
     
+/* --- dead code removal ---
     public String toJava() throws IOException, EngineException{
           JavaCompiler jc = new JavaCompiler();
           jc.compile(this);
           return jc.toString();
     }
+ --- dead code removal --- */
     
     @Override
     public String toString() {
@@ -2505,11 +2609,13 @@ public String toString() {
     }
     
     // service s1 s2 -> service s1 union service s2
+/* --- dead code removal ---
     public String toString(boolean std) {
        return new ASTPrinter(this)
                .setService(true)
                .toString();
     }
+ --- dead code removal --- */
        
     boolean isData() {
         return isInsertData() || isDeleteData();
@@ -2624,9 +2730,11 @@ public Exp getDelete() {
         return delete;
     }
 
+/* --- dead code removal ---
     public static int getTripleId() {
         return nbt++;
     }
+ --- dead code removal --- */
 
     public Exp getBody() {
         return bodyExp;
@@ -2636,13 +2744,17 @@ public Exp getSaveBody() {
         return bodySave;
     }
 
+/* --- dead code removal ---
     public void setSaveBody(Exp exp) {
         bodySave = exp;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public Exp getHead() {
         return constructExp;
     }
+ --- dead code removal --- */
 
     public void setBody(Exp bodyExp) {
         this.bodyExp = bodyExp;
@@ -2679,6 +2791,7 @@ public Exp getPragma() {
         return getPragma(RDFS.COSPRAGMA);
     }
 
+/* --- dead code removal ---
     public boolean hasPragma(String subject, String property, String object) {
         if (getPragma() == null) {
             return false;
@@ -2695,7 +2808,9 @@ public boolean hasPragma(String subject, String property, String object) {
         }
         return false;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void addPragma(Triple t) {
         Exp pragma = getPragma();
         if (pragma == null) {
@@ -2704,6 +2819,7 @@ public void addPragma(Triple t) {
         }
         pragma.add(t);
     }
+ --- dead code removal --- */
 
     public Exp getPrefixExp() {
         return prefixExp;
@@ -2720,9 +2836,11 @@ public void setPrefixExp(Exp exp) {
         prefixExp = exp;
     }
 
+/* --- dead code removal ---
     public void definePrefix(String prefix, String ns) {
         defNamespace(prefix, ns);
     }
+ --- dead code removal --- */
 
     public void defNamespace(String prefix, String ns) {
         defNSNamespace(prefix, ns);
@@ -2747,9 +2865,11 @@ public String getService() {
         return service;
     }
 
+/* --- dead code removal ---
     public boolean hasService() {
         return service != null;
     }
+ --- dead code removal --- */
     
     public ASTQuery getSetSubQuery(Service s) {
         Exp bgp = s.getBodyExp();
@@ -2804,11 +2924,15 @@ public String defURI(String s) {
         return s;
     }
 
+/* --- dead code removal ---
     public void setCount(String var) {
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setSort(String var, boolean breverse) {
     }
+ --- dead code removal --- */
 
     public void setSort(Expression sortExpression) {
         setSort(sortExpression, false);
@@ -2844,6 +2968,7 @@ void setGroupBy(List<Expression> list) {
         lGroup = list;
     }
 
+/* --- dead code removal ---
     public boolean isGroupBy(String name) {
         for (Expression exp : lGroup) {
             if (exp.isVariable() && exp.getName().equals(name)) {
@@ -2852,6 +2977,7 @@ public boolean isGroupBy(String name) {
         }
         return false;
     }
+ --- dead code removal --- */
 
     public void setGroup(List<Variable> list) {
         for (Variable var : list) {
@@ -2878,23 +3004,29 @@ public void setGroup(Expression exp, Variable var) {
         }
     }
 
+/* --- dead code removal ---
     public List<Variable> getVariableBindings() {
         if (values != null) {
             return values.getVarList();
         }
         return null;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void clearBindings() {
         values = null;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public List<List<Constant>> getValueBindings() {
         if (values != null) {
             return values.getValues();
         }
         return null;
     }
+ --- dead code removal --- */
     
     public Values createValues(List<Variable> list, Expression exp) {
         return complete(Values.create(list, exp));
@@ -3006,8 +3138,10 @@ public void setSelect(Variable var, Expression e) {
         }
     }
 
+/* --- dead code removal ---
     public void setSelect() {
     }
+ --- dead code removal --- */
 
     public List<Boolean> getReverse() {
         return reverseTable;
@@ -3017,15 +3151,19 @@ void setReverse(List<Boolean> list) {
         reverseTable = list;
     }
 
+/* --- dead code removal ---
     public String toSparql() {
         return toString();
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setDescribe(boolean describe) {
         if (describe) {
             setResultForm(QT_DESCRIBE);
         }
     }
+ --- dead code removal --- */
 
     public void setAsk(boolean b) {
         if (b) {
@@ -3033,11 +3171,13 @@ public void setAsk(boolean b) {
         }
     }
 
+/* --- dead code removal ---
     public void setSelect(boolean b) {
         if (b) {
             setResultForm(QT_SELECT);
         }
     }
+ --- dead code removal --- */
 
     public void setTemplate(boolean b) {
         isTemplate = b;
@@ -3075,44 +3215,60 @@ public boolean isDelete() {
         return isDelete;
     }
 
+/* --- dead code removal ---
     public boolean isSPARQLQuery() {
         return isSelect() || isAsk() || isDescribe() || (isConstruct() && !isInsert());
     }
+ --- dead code removal --- */
 
     public boolean isSPARQLUpdate() {
         return isUpdate() || isInsert() || isDelete();
     }
 
+/* --- dead code removal ---
     public void setDefaultThreshold(float threshold) {
         DefaultThreshold = threshold;
         setThreshold(threshold);
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setDefaultMaxProjection(int maxProjection) {
         DefaultMaxProjection = maxProjection;
         setMaxProjection(maxProjection);
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setDefaultMaxLength(int maxLength) {
         DefaultMaxLength = maxLength;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public int getDefaultMaxLength() {
         return DefaultMaxLength;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setDefaultMaxResult(int maxResult) {
         DefaultMaxResult = maxResult;
         setMaxResult(maxResult);
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public float getDefaultThreshold() {
         return DefaultThreshold;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public int getDefaultMaxProjection() {
         return DefaultMaxProjection;
     }
+ --- dead code removal --- */
 
     public int getDefaultMaxResult() {
         return DefaultMaxResult;
@@ -3122,21 +3278,27 @@ public static String getRootPropertyQN() {
         return RootPropertyQN;
     }
 
+/* --- dead code removal ---
     public static void setRootPropertyQN(String rootPropertyQN) {
         RootPropertyQN = rootPropertyQN;
     }
+ --- dead code removal --- */
 
     public static String getRootPropertyURI() {
         return RootPropertyURI;
     }
 
+/* --- dead code removal ---
     public static void setRootPropertyURI(String rootPropertyURI) {
         RootPropertyURI = rootPropertyURI;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public boolean isDefineExp(Expression exp) {
         return selectExp.get(exp) != null;
     }
+ --- dead code removal --- */
 
     public Expression getExpression(String name) {
         return selectFunctions.get(name);
@@ -3175,6 +3337,7 @@ public List<Expression> getModifierExpressions() {
         return list;
     }
 
+/* --- dead code removal ---
     public Expression getExtExpression(String name) {
         Expression sexp = getExpression(name);
         if (sexp == null) {
@@ -3183,14 +3346,17 @@ public Expression getExtExpression(String name) {
         // rewrite var as exp
         return sexp.process(this);
     }
+ --- dead code removal --- */
 
     public HashMap<String, Expression> getSelectFunctions() {
         return selectFunctions;
     }
 
+/* --- dead code removal ---
     public void setSelectFunctions(HashMap<String, Expression> selectFunctions) {
         this.selectFunctions = selectFunctions;
     }
+ --- dead code removal --- */
 
     public void set(ASTUpdate u) {
         setResultForm(ASTQuery.QT_UPDATE);
@@ -3254,9 +3420,11 @@ public ASTTemplate defineTemplate(){
         return atemp;
     }
     
+/* --- dead code removal ---
     public ASTTemplate getTemplate(){
         return atemp;
     }
+ --- dead code removal --- */
     
     public int getPriority() {
         return priority;
@@ -3280,17 +3448,23 @@ void compileTemplate() {
      * Aggregate that build the result of a template when there are several
      * results default is group_concat draft: agg_and
      */
+/* --- dead code removal ---
     public static void setTemplateAggregate(String s) {
         ASTTemplate.setTemplateAggregate(s);
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public static void setTemplateConcat(String s) {
         ASTTemplate.setTemplateConcat(s);
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public void setName(String label) {
         name = label;
     }
+ --- dead code removal --- */
 
     public void setName(Constant cst) {
         name = cst.getLabel();
@@ -3304,9 +3478,11 @@ public boolean isAllResult() {
         return isAllResult;
     }
 
+/* --- dead code removal ---
     private void setAllResult(boolean isAllResult) {
         this.isAllResult = isAllResult;
     }
+ --- dead code removal --- */
      
     public Term getTemplateGroup() {
         return atemp.getTemplateGroup();
@@ -3392,21 +3568,27 @@ public void setApproximateSearchOptions(String key, String value) {
         }
     }
 
+/* --- dead code removal ---
     public List<String> getApproximateSearchOptions(String key) {
         return this.approximateSearchOptions.get(key);
     }
+ --- dead code removal --- */
 
     public List<QueryVisitor> getVisitorList() {
         return visitList;
     }
    
+/* --- dead code removal ---
     public void setVisitorList(List<QueryVisitor> visitList) {
         this.visitList = visitList;
     }
+ --- dead code removal --- */
     
+/* --- dead code removal ---
     public void addVisitor(QueryVisitor vis) {
         visitList.add(vis);
     }
+ --- dead code removal --- */
        
     public boolean isLDScript() {
         return ldscript;
@@ -3486,10 +3668,12 @@ public ASTQuery groupby(Expression e) {
         return this;
     }
      
+/* --- dead code removal ---
      public ASTQuery groupby(Expression e, Variable var) {
         setGroup(e, var);
         return this;
     } 
+ --- dead code removal --- */
     
     public ASTQuery where(Exp... exp) {
         if (exp.length == 1) {
@@ -3545,9 +3729,11 @@ public Minus minus(Exp e1, Exp e2) {
         return new Minus(abgp(e1), abgp(e2));
     }
     
+/* --- dead code removal ---
     public Exp filter(Expression e) {
         return createFilter(e);
     }
+ --- dead code removal --- */
     
     public Term count(Expression exp) {
         return Term.function(Processor.COUNT, exp);
@@ -3595,6 +3781,7 @@ public Context getCreateContext() {
         return getContext();
     }
     
+/* --- dead code removal ---
     public Context getContext(fr.inria.corese.core.kgram.core.Query q) {
         if (getContext() != null) {
             return getContext();
@@ -3602,6 +3789,7 @@ public Context getContext(fr.inria.corese.core.kgram.core.Query q) {
         q.setContext(getCreateContext());
         return getContext();
     }
+ --- dead code removal --- */
     
     
     // log generated by service interpreter ProviderImpl and Service (corese core)
@@ -3610,9 +3798,11 @@ public ContextLog getLog() {
         return getCreateContext().getLog();
     }
     
+/* --- dead code removal ---
     public synchronized ContextLog getLogSync() {
         return getLog();
     }
+ --- dead code removal --- */
 
     public HashMap<String, Expression> getGroupByMap() {
         return groupBy;
@@ -3698,13 +3888,17 @@ public List<Triple> getPathList() {
         return pathList;
     }
 
+/* --- dead code removal ---
     public void setPathList(List<Triple> pathList) {
         this.pathList = pathList;
     }
+ --- dead code removal --- */
 
+/* --- dead code removal ---
     public boolean isFederateVisit() {
         return federateVisit;
     }
+ --- dead code removal --- */
 
     public void setFederateVisit(boolean federateVisit) {
         this.federateVisit = federateVisit;
@@ -3714,9 +3908,11 @@ public List<Service> getServiceExpList() {
         return serviceExpList;
     }
 
+/* --- dead code removal ---
     public void setServiceExpList(List<Service> serviceExpList) {
         this.serviceExpList = serviceExpList;
     }
+ --- dead code removal --- */
 
     public ASTSelector getAstSelector() {
         return astSelector;
@@ -3730,9 +3926,11 @@ public ASTFactory getFactory() {
         return factory;
     }
 
+/* --- dead code removal ---
     public void setFactory(ASTFactory factory) {
         this.factory = factory;
     }
+ --- dead code removal --- */
 
     public boolean isSubmitTriple() {
         return submitTriple;