diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
index 05539d4..6e59a0e 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -559,7 +559,7 @@ public PreparedOlapStatement prepareOlapStatement(
     public MdxParserFactory getParserFactory() {
         return new MdxParserFactory() {
             public MdxParser createMdxParser(OlapConnection connection) {
-                return new DefaultMdxParserImpl(connection);
+                return new DefaultMdxParserImpl();
             }
 
             public MdxValidator createMdxValidator(OlapConnection connection) {
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
index f2dd756..e47cb5a 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
@@ -4,14 +4,13 @@
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
 // Copyright (C) 1999-2002 Kana Software, Inc.
-// Copyright (C) 2002-2009 Julian Hyde and others.
+// Copyright (C) 2002-2010 Julian Hyde and others.
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
 */
 
 import java_cup.runtime.*;
 import java.util.*;
-import org.olap4j.OlapConnection;
 import org.olap4j.Axis;
 import org.olap4j.mdx.*;
 import org.olap4j.mdx.parser.MdxParseException;
@@ -21,7 +20,6 @@ parser code {:
     // Generated from $Id$
     Scanner scanner;
     private String queryString;
-    private OlapConnection mdxConnection;
     private DefaultMdxParserImpl.FunTable funTable;
     private boolean load;
 
@@ -31,14 +29,13 @@ parser code {:
     ParseTreeNode recursivelyParseExp(String s)
     {
         return new DefaultMdxParser().parseExpression(
-            mdxConnection, s, false, funTable);
+            s, false, funTable);
     }
 
     /**
       * Parses a string to create a {@link SelectNode}.
       */
     SelectNode parseSelect(
-        OlapConnection mdxConnection,
         String queryString,
         boolean debug,
         DefaultMdxParserImpl.FunTable funTable,
@@ -46,7 +43,6 @@ parser code {:
     {
         Symbol parse_tree = null;
         this.scanner = new StringScanner(queryString, debug);
-        this.mdxConnection = mdxConnection;
         this.queryString = queryString;
         this.funTable = funTable;
         this.load = load;
@@ -63,7 +59,6 @@ parser code {:
                 e);
         } finally {
             this.scanner = null;
-            this.mdxConnection = null;
             this.queryString = null;
             this.funTable = null;
         }
@@ -73,7 +68,6 @@ parser code {:
       * Parses a string to create an expression.
       */
     ParseTreeNode parseExpression(
-        OlapConnection mdxConnection,
         String queryString,
         boolean debug,
         DefaultMdxParserImpl.FunTable funTable)
@@ -83,7 +77,6 @@ parser code {:
             debug,
             new StringScanner(queryString, debug),
             new int[] {DefaultMdxParserSym._VALUE_EXPRESSION});
-        this.mdxConnection = mdxConnection;
         this.queryString = queryString;
         this.funTable = funTable;
         try {
@@ -100,7 +93,6 @@ parser code {:
                 e);
         } finally {
             this.scanner = null;
-            this.mdxConnection = null;
             this.queryString = null;
             this.funTable = null;
         }
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
index 333bb89..c59857a 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2008 Julian Hyde
+// Copyright (C) 2006-2010 Julian Hyde
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
 */
@@ -22,7 +22,6 @@
  * @since Aug 22, 2006
  */
 public class DefaultMdxParserImpl implements MdxParser {
-    private final OlapConnection connection;
     private boolean debug = false;
     private boolean load = false;
     private final FunTable funTable = new FunTable() {
@@ -31,14 +30,17 @@ public boolean isProperty(String s) {
         }
     };
 
+    @Deprecated
     public DefaultMdxParserImpl(OlapConnection olapConnection) {
         super();
-        connection = olapConnection;
+    }
+
+    public DefaultMdxParserImpl() {
+        super();
     }
 
     public SelectNode parseSelect(String mdx) {
         return new DefaultMdxParser().parseSelect(
-            connection,
             mdx,
             debug,
             funTable,
@@ -47,7 +49,6 @@ public SelectNode parseSelect(String mdx) {
 
     public ParseTreeNode parseExpression(String mdx) {
         return new DefaultMdxParser().parseExpression(
-            connection,
             mdx,
             debug,
             funTable);