diff --git a/.classpath b/.classpath
index c9b23a89df..5682a59f8b 100644
--- a/.classpath
+++ b/.classpath
@@ -33,6 +33,6 @@
 	<classpathentry kind="lib" path="lib/jogamp/jocl.jar" sourcepath="lib/jogamp/jocl-sources.jar"/>
 	<classpathentry kind="lib" path="lib/jogamp/gluegen-rt-natives-linux-amd64.jar"/>
 	<classpathentry kind="lib" path="lib/jogamp/gluegen-rt.jar" sourcepath="lib/jogamp/gluegen-rt-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Python 2.7.2 (/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python) interpreter library"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/python) interpreter library"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/src/main/java/water/exec/Env.java b/src/main/java/water/exec/Env.java
index 965d0e34f5..b2f98eda73 100644
--- a/src/main/java/water/exec/Env.java
+++ b/src/main/java/water/exec/Env.java
@@ -262,7 +262,7 @@ private void subRef(Env global) {
   // Remove everything
   public void remove() {
     // Remove all shallow scopes
-    while( _tod > 1 ) popScope();
+    while( _tod > 0 ) popScope();
     // Push changes at the outer scope into the K/V store
     while( _sp > 0 ) {
       if( isAry() && _key[_sp-1] != null ) { // Has a K/V mapping?