diff --git a/Kieker.WebGUI/lib/jetty-runner-8.1.0.v20120127.LICENSE b/Kieker.WebGUI/lib/jetty-runner-8.1.4.v20120524.LICENSE
similarity index 100%
rename from Kieker.WebGUI/lib/jetty-runner-8.1.0.v20120127.LICENSE
rename to Kieker.WebGUI/lib/jetty-runner-8.1.4.v20120524.LICENSE
diff --git a/Kieker.WebGUI/lib/jetty-runner-8.1.0.v20120127.jar b/Kieker.WebGUI/lib/jetty-runner-8.1.4.v20120524.jar
similarity index 53%
rename from Kieker.WebGUI/lib/jetty-runner-8.1.0.v20120127.jar
rename to Kieker.WebGUI/lib/jetty-runner-8.1.4.v20120524.jar
index fabbf24d8ab38d44d6d47656ba45aaea94d432e7..ba1089212fe5c2d16a9e52c6fded55b83ae7d558 100644
Binary files a/Kieker.WebGUI/lib/jetty-runner-8.1.0.v20120127.jar and b/Kieker.WebGUI/lib/jetty-runner-8.1.4.v20120524.jar differ
diff --git a/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar b/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar
index 3e41a675a82fae11b5bf9229cb881a9529b97c50..ee878afdebfc6da0433f38bbfe1bbb469f026590 100644
Binary files a/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar and b/Kieker.WebGUI/lib/kieker-1.6-SNAPSHOT_emf.jar differ
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index 15ff01e63d1b019716ce662faee91fa094c93320..6ec6c8963f91f848effde8d3eff334acd2efb26e 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -317,7 +317,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.0.v20120127</version>
+                <version>8.1.4.v20120524</version>
                 <configuration>
                     <scanIntervalSeconds>5</scanIntervalSeconds>
                     <connectors>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
index 6a9bd3d0df1b04150cb3787285eec5641737eada..66cfc5df3a2f579d7b1dbc8880868e9c69ae62a3 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentWorkSpaceProjectBean.java
@@ -80,7 +80,6 @@ import org.eclipse.emf.ecore.EObject;
  * @author Nils Christian Ehmke
  * @version 1.0
  */
-// TODO Clean the connections when someone removes a plugin/repository
 @ManagedBean
 @SessionScoped
 public final class CurrentWorkSpaceProjectBean {
@@ -485,6 +484,7 @@ public final class CurrentWorkSpaceProjectBean {
 				// Update the time stamp!
 				this.resetTimeStamp();
 			} catch (final IOException ex) {
+				ex.printStackTrace();
 				CurrentWorkSpaceProjectBean.LOG.error("An error occured while saving the project.", ex);
 				CurrentWorkSpaceProjectBean.showMessage(FacesMessage.SEVERITY_ERROR, "An error occured while saving the project.");
 			} catch (final NewerProjectException ex) {
@@ -756,14 +756,18 @@ public final class CurrentWorkSpaceProjectBean {
 		synchronized (this) {
 			this.project.getRepositories().remove(repository);
 
-			// Remove the corresponding connections
+			// Remove the corresponding repositories from the connections
 			final List<ConnectionFilterToRepository> fRDelList = new ArrayList<ConnectionFilterToRepository>();
 			for (final ConnectionFilterToRepository conn : this.filter2repositoryConnections) {
 				if (conn.getDestination() == repository) {
 					fRDelList.add(conn);
 				}
 			}
-			this.filter2repositoryConnections.removeAll(fRDelList);
+
+			// Remove them from the project as well
+			for (final ConnectionFilterToRepository conn : fRDelList) {
+				conn.getOutputPort().setRepository(null);
+			}
 
 			if (this.selectedRepository == repository) {
 				this.selectedRepository = null; // NOPMD
@@ -789,6 +793,12 @@ public final class CurrentWorkSpaceProjectBean {
 				}
 			}
 			this.filter2filterConnections.removeAll(ffDelList);
+			// Remove them from the project as well
+			for (final ConnectionFilterToFilter conn : ffDelList) {
+				if (conn.getDestination() == plugin) {
+					conn.getOutputPort().getSubscribers().remove(conn.getInputPort());
+				}
+			}
 
 			final List<ConnectionFilterToRepository> fRDelList = new ArrayList<ConnectionFilterToRepository>();
 			for (final ConnectionFilterToRepository conn : this.filter2repositoryConnections) {