diff --git a/build/lib/dist/jgoodies-common-1.2.0.jar b/build/lib/dist/jgoodies-common-1.2.0.jar
deleted file mode 100644
index a194bf78..00000000
Binary files a/build/lib/dist/jgoodies-common-1.2.0.jar and /dev/null differ
diff --git a/build/lib/dist/jgoodies-looks-2.4.1.jar b/build/lib/dist/jgoodies-looks-2.4.1.jar
deleted file mode 100644
index 7a0cb410..00000000
Binary files a/build/lib/dist/jgoodies-looks-2.4.1.jar and /dev/null differ
diff --git a/build/rpm/spark.spec b/build/rpm/spark.spec
index 4f8fc0b2..ed61c21a 100644
--- a/build/rpm/spark.spec
+++ b/build/rpm/spark.spec
@@ -74,8 +74,6 @@ exit 0
 /usr/share/spark/lib/fmj.jar
 /usr/share/spark/lib/jdom.jar
 /usr/share/spark/lib/i4jruntime.jar
-/usr/share/spark/lib/jgoodies-common-1.2.0.jar
-/usr/share/spark/lib/jgoodies-looks-2.4.1.jar
 /usr/share/spark/lib/JTattoo.jar
 %dir /usr/share/spark/lib/linux/
 /usr/share/spark/lib/linux/libcivil.so
diff --git a/src/java/org/jivesoftware/spark/ui/themes/ThemePanel.java b/src/java/org/jivesoftware/spark/ui/themes/ThemePanel.java
index b262e188..808474ea 100644
--- a/src/java/org/jivesoftware/spark/ui/themes/ThemePanel.java
+++ b/src/java/org/jivesoftware/spark/ui/themes/ThemePanel.java
@@ -128,10 +128,6 @@ public class ThemePanel extends JPanel {
 		"com.jtattoo.plaf.mint.MintLookAndFeel",
 		"com.jtattoo.plaf.noire.NoireLookAndFeel",
 		"com.jtattoo.plaf.smart.SmartLookAndFeel",
-		//JGoodies
-		"com.jgoodies.looks.plastic.Plastic3DLookAndFeel",
-		"com.jgoodies.looks.plastic.PlasticLookAndFeel",
-		"com.jgoodies.looks.plastic.PlasticXPLookAndFeel",
 		//Substance
 		"org.jvnet.substance.skin.SubstanceAutumnLookAndFeel",
 		"org.jvnet.substance.skin.SubstanceBusinessBlackSteelLookAndFeel",
diff --git a/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java b/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java
index f9959559..c78f0e81 100644
--- a/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java
+++ b/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java
@@ -597,15 +597,6 @@ public class SipManager implements SipListener {
         try {
 
         	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
-        	// TODO : Anpassen
             //SIPTransaction.setRegisterTimeout(10);
 
             //registerRetries = 0;