--- a/src/main/scala/SPARQL.scala	Mon Dec 28 11:45:54 2009 -0500
+++ b/src/main/scala/SPARQL.scala	Mon Dec 28 13:40:13 2009 -0500
@@ -90,7 +90,6 @@
 
   def groupgraphpattern:Parser[GraphPattern] = (
     "{" ~ opt(triplesblock) ~ rep(graphpatternnottriplesORfilter ~ opt(triplesblock)) ~ "}" ^^
-    //"{" ~ opt(triplesblock) ~ rep(graphpatternnottriplesORfilter_OPTtriplesblock) ~ "}" ^^
     {
       case "{"~tbOPT~gpntORf_tbOPT~"}" => {
 	val l:Option[GraphPattern] = tbOPT
@@ -109,9 +108,6 @@
     }
   )
 
-  def graphpatternnottriplesORfilter_OPTtriplesblock:Parser[(GraphPattern, Option[TriplesBlock])] =
-    graphpatternnottriplesORfilter ~ opt(triplesblock) ^^ { case a~b => (a, b) }
-
   def graphpatternnottriplesORfilter:Parser[GraphPattern] = (
       "OPTIONAL"~groupgraphpattern ^^ { case "OPTIONAL"~ggp => OptionalGraphPattern(ggp) }
     | rep1sep(groupgraphpattern, "UNION") ^^ { x => if (x.size > 1) TableDisjunction(x) else x(0) }