Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (revision 267)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (revision 268)
@@ -17,9 +17,7 @@
     List<String> nodeType;
     String sparqlEndpoint;
-    Set<Integer> visited;
-    //List<Map<Integer, Integer>> edgeweight;
-    //List<Integer> nodeweight;
     Map<String, Boolean> checkedpaths;
     
+    /*
     public class LinkAndPath{
         String originalClassURI; // originalClasssURI -classLink.propertyURI-> classLink.linkedClassURL
@@ -46,5 +44,5 @@
            this.classURIs = classURIs;
         }
-    }
+    }*/
 
     public OWLClassGraph(){ // not used
@@ -59,4 +57,5 @@
     }
     
+    /*
     public OWLClassGraph(RDFSchemaAnalyzer rdfsa, String sparqlEndpoint, String startClass){ // used
         super();
@@ -64,4 +63,5 @@
         setPartClassGraph(rdfsa, sparqlEndpoint, startClass);
     }
+    */
 
     public int getNumberOfEdge(String url){
@@ -72,12 +72,5 @@
         return adjlist.get(node).size();
     }
-    
-    public boolean visitedNode(String classURI){
-        if ( visited.contains(labelednodes.get(classURI)) ){
-            return true;
-        }
-        return false;
-    }
-    
+        
     public Path[] getPaths(String startClass, String endClass){
         List<List<ClassLink>> paths = searchPaths(startClass, endClass);
Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/EndpointAnalyzer.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/EndpointAnalyzer.java (revision 267)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/EndpointAnalyzer.java (revision 268)
@@ -1,9 +1,5 @@
 package org.biohackathon.SPARQLBuilder.OWL;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 import com.hp.hpl.jena.query.Query;
@@ -152,4 +148,11 @@
 	 */
 
+	public List<SClass> getOWLClassList(String[] graphURIs, String[] keywords,
+			String language,
+
+			boolean countInstances) throws Exception {
+            return null; //dummy
+        }
+        
 //        public List<SClass> 
         
Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 267)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 268)
@@ -16,7 +16,5 @@
 
 public class QueryPathGenerator {
-    //private String sparqlEndpoint = null;
     private RDFSchemaAnalyzerFactory factory = null;
-    //private RDFSchemaAnalyzer analyzer = null;
     private HashMap<String, RDFSchemaAnalyzer> analyzers = null;
     private OWLClassGraph graph;
Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java (revision 267)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java (revision 268)
@@ -81,8 +81,8 @@
         
         HttpSession session = request.getSession();
-        //QueryPathGenerator qpg = (QueryPathGenerator)session.getAttribute("qpg");
-        //if ( qpg == null ){
-        QueryPathGenerator qpg = new QueryPathGenerator(ep);
-        //}
+        QueryPathGenerator qpg = (QueryPathGenerator)session.getAttribute("qpg");
+        if ( qpg == null ){
+            qpg = new QueryPathGenerator();
+        }
         SClass[] classes = qpg.getClasses(null);
         qpg.setClassLabels(classes);
Index: SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java
===================================================================
--- SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 267)
+++ SPARQLBuilderWWW2016/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 268)
@@ -90,6 +90,5 @@
             for ( int i = 0; i < eplist.length; i++ ){
                 try{
-                    qpg.setSPARQLendpoint(eplist[i]);
-                    SClass[] classes = qpg.getClasses(null);
+                    SClass[] classes = qpg.getClassesByEndpoint(eplist[i]);
                     sortedClasses = qpg.getSortedClasses(classes);
                     JsonArray ja = getJsonArrayFromSortedClasses(jbfactory, sortedClasses);
@@ -104,9 +103,8 @@
         }
         String classURI = request.getParameter("class");
-        qpg.setSPARQLendpoint(ep);
         SClass[] classes = null;
         if ( classURI != null ){
-            qpg.setOWLClassGraph(classURI);
-            classes = qpg.getReachableClasses();
+            //qpg.setOWLClassGraph(classURI); // KOKO
+            //classes = qpg.getReachableClasses();
         }else{
             classes = qpg.getClasses(null);