poms cleaning
diff --git a/taverna-loop-ui/pom.xml b/taverna-loop-ui/pom.xml
index 97be01c..5549d6d 100644
--- a/taverna-loop-ui/pom.xml
+++ b/taverna-loop-ui/pom.xml
@@ -108,5 +108,11 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.taverna.ui-activities</groupId>
+            <artifactId>taverna-beanshell-activity-ui</artifactId>
+            <version>3.1.0-incubating-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/taverna-menu-items/pom.xml b/taverna-menu-items/pom.xml
index 81a550a..350f9bb 100644
--- a/taverna-menu-items/pom.xml
+++ b/taverna-menu-items/pom.xml
@@ -84,17 +84,15 @@
 			<artifactId>stringconstant-activity-ui</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-	 <dependency>
-	  <groupId>org.apache.taverna.workbench</groupId>
-	  <artifactId>taverna-stringconstant-activity-ui</artifactId>
-	  <version>3.1.0-incubating-SNAPSHOT</version>
-	  <type>jar</type>
-	 </dependency>
-	 <dependency>
-	  <groupId>org.apache.taverna.workbench</groupId>
-	  <artifactId>taverna-contextual-views-impl</artifactId>
-	  <version>3.1.0-incubating-SNAPSHOT</version>
-	  <type>jar</type>
-	 </dependency>
+                <dependency>
+                        <groupId>${project.parent.groupId}</groupId>
+                        <artifactId>taverna-stringconstant-activity-ui</artifactId>
+                        <version>${project.parent.version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>${project.parent.groupId}</groupId>
+                        <artifactId>taverna-contextual-views-impl</artifactId>
+                        <version>${project.parent.version}</version>
+                </dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/taverna-perspective-myexperiment/pom.xml b/taverna-perspective-myexperiment/pom.xml
index 217c137..3d47e46 100644
--- a/taverna-perspective-myexperiment/pom.xml
+++ b/taverna-perspective-myexperiment/pom.xml
@@ -52,7 +52,11 @@
 			<artifactId>taverna-ui</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-
+                <dependency>
+                        <groupId>${project.parent.groupId}</groupId>
+                        <artifactId>taverna-file-impl</artifactId>
+                        <version>${project.parent.version}</version>
+                </dependency>
 		<dependency>
 			<groupId>org.apache.taverna.osgi</groupId>
 			<artifactId>taverna-configuration-api</artifactId>
@@ -84,6 +88,7 @@
                     <artifactId>taverna-credential-manager</artifactId>
                     <version>${taverna.engine.version}</version>
                 </dependency>
+
 	</dependencies>
 	<packaging>bundle</packaging>
 </project>
diff --git a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
index a6155f5..022a22e 100644
--- a/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
+++ b/taverna-perspective-myexperiment/src/main/java/org/apache/taverna/ui/perspectives/myexperiment/UploadWorkflowDialog.java
@@ -70,7 +70,7 @@
 import org.apache.taverna.ui.perspectives.myexperiment.model.Util;
 import org.apache.taverna.ui.perspectives.myexperiment.model.Workflow;
 import org.apache.taverna.workbench.file.FileManager;
-import net.sf.taverna.t2.workbench.file.impl.actions.SaveWorkflowAsAction;
+import org.apache.taverna.workbench.file.impl.actions.SaveWorkflowAsAction;
 import org.apache.taverna.workbench.helper.HelpEnabledDialog;
 import org.apache.taverna.workbench.icons.WorkbenchIcons;
 import org.apache.taverna.workflowmodel.Dataflow;
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
index e255e73..1d01de6 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/saveactions/SaveAllResultsAsXML.java
@@ -29,7 +29,7 @@
 
 import javax.swing.AbstractAction;
 
-import net.sf.taverna.t2.results.BaclavaDocumentPathHandler;
+import org.apache.taverna.results.BaclavaDocumentPathHandler;
 
 /**
  * Stores the entire map of result objects to disk as a single XML data
diff --git a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
index 416346a..4b6e314 100644
--- a/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
+++ b/taverna-results-view/src/main/java/org/apache/taverna/workbench/views/results/workflow/RenderedResultComponent.java
@@ -27,7 +27,7 @@
 import static javax.swing.BoxLayout.LINE_AXIS;
 import static javax.swing.SwingUtilities.invokeLater;
 import static org.apache.taverna.renderers.RendererUtils.getInputStream;
-import static net.sf.taverna.t2.results.ResultsUtils;
+import static org.apache.taverna.results.ResultsUtils;
 import static org.apache.taverna.workbench.icons.WorkbenchIcons.refreshIcon;
 import static org.apache.commons.lang.StringEscapeUtils.escapeHtml;
 
diff --git a/taverna-workflow-explorer/pom.xml b/taverna-workflow-explorer/pom.xml
index cc34651..ad2d0f4 100644
--- a/taverna-workflow-explorer/pom.xml
+++ b/taverna-workflow-explorer/pom.xml
@@ -40,11 +40,6 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-workbench-impl</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>taverna-workflow-view</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>