diff --git a/.classpath b/.classpath
index f76fdf9cb1d..37e4eb18e58 100644
--- a/.classpath
+++ b/.classpath
@@ -6,8 +6,6 @@
 	<classpathentry kind="src" path="src/test"/>
 	<classpathentry exported="true" kind="lib" path="jar/jgrapht-0.6.0.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/jniinchi-0.5.jar" sourcepath="cdksrc.zip"/>
-	<classpathentry exported="true" kind="lib" path="jar/JRI.jar" sourcepath="cdksrc.zip"/>
-	<classpathentry exported="true" kind="lib" path="jar/sjava-0.68.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/vecmath1.2-1.14.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/xom-1.1.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/jama-1.0.2.jar" sourcepath="cdksrc.zip"/>
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 91f95c40ab8..cea5c581973 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -75,10 +75,6 @@ Export-Package: javax.vecmath,
  org.openscience.cdk.qsar.descriptors.data,
  org.openscience.cdk.qsar.descriptors.molecular,
  org.openscience.cdk.qsar.descriptors.protein,
- org.openscience.cdk.qsar.model,
- org.openscience.cdk.qsar.model.R,
- org.openscience.cdk.qsar.model.R2,
- org.openscience.cdk.qsar.model.data,
  org.openscience.cdk.qsar.result,
  org.openscience.cdk.reaction,
  org.openscience.cdk.reaction.mechanism,
diff --git a/src/test/org/openscience/cdk/modulesuites/MqsarTests.java b/src/test/org/openscience/cdk/modulesuites/MqsarTests.java
index 99bf76d8794..8c079adb7a2 100644
--- a/src/test/org/openscience/cdk/modulesuites/MqsarTests.java
+++ b/src/test/org/openscience/cdk/modulesuites/MqsarTests.java
@@ -1,9 +1,4 @@
-/* $RCSfile$
- * $Author$
- * $Date$
- * $Revision$
- *
- * Copyright (C) 1997-2007  The Chemistry Development Kit (CDK) project
+/* Copyright (C) 1997-2007,2010  The Chemistry Development Kit (CDK) project
  *
  * Contact: cdk-devel@lists.sourceforge.net
  *
@@ -21,7 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-
 package org.openscience.cdk.modulesuites;
 
 import org.junit.runner.RunWith;
@@ -29,9 +23,6 @@
 import org.junit.runners.Suite.SuiteClasses;
 import org.openscience.cdk.coverage.QsarCoverageTest;
 import org.openscience.cdk.qsar.DescriptorExceptionTest;
-import org.openscience.cdk.qsar.model.R2.CNNRegressionModelTest;
-import org.openscience.cdk.qsar.model.R2.LinearRegressionModelTest;
-import org.openscience.cdk.qsar.model.R2.RJavaEnvironmentTest;
 
 /**
  * TestSuite that runs all the sample tests.
@@ -43,9 +34,6 @@
 @RunWith(value=Suite.class)
 @SuiteClasses(value={
     QsarCoverageTest.class,
-    DescriptorExceptionTest.class,
-    LinearRegressionModelTest.class,
-    CNNRegressionModelTest.class,
-    RJavaEnvironmentTest.class
+    DescriptorExceptionTest.class
 })
 public class MqsarTests {}