diff --git a/SmartIrc4net b/SmartIrc4net
deleted file mode 160000
index 036e2233..00000000
--- a/SmartIrc4net
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 036e2233aea9bd3b4a30f8c5136daff0187eb5ec
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index f953fb2f..b696aa1b 100755
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -1,12 +1,6 @@
 ASSEMBLY = SparkleLib
 TARGET = library
 
-if HAVE_SMARTIRC4NET
-LINK = $(REF_SPARKLELIB) $(LINK_SMARTIRC4NET_SYSTEM)
-else
-LINK = $(REF_SPARKLELIB) $(LINK_SMARTIRC4NET_LOCAL)
-endif
-
 SOURCES =  \
 	Defines.cs \
 	Git/SparkleFetcherGit.cs \
@@ -17,16 +11,11 @@ SOURCES =  \
 	SparkleFetcherBase.cs \
 	SparkleHelpers.cs \
 	SparkleListenerBase.cs \
-	SparkleListenerIrc.cs \
 	SparkleListenerTcp.cs \
 	SparkleRepoBase.cs \
 	SparkleWatcher.cs
 
 
-SMARTIRC4NET_FILES_EXPANDED = $(foreach file, $(SMARTIRC4NET_FILES), $(top_builddir)/$(file))
-
-EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED)
-
 install-data-hook:
 	for ASM in $(EXTRA_BUNDLE); do \
 		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 84a7ffd8..d8cde142 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -575,42 +575,6 @@ namespace SparkleShare {
         }
 
 
-        // Enables or disables the 'Next' button depending on the
-        // entries filled in by the user
-        private void CheckSetupPage ()
-        {
-            if (NameEntry.Text.Length > 0 &&
-                Program.Controller.IsValidEmail (EmailEntry.Text)) {
-
-                NextButton.Sensitive = true;
-            } else {
-                NextButton.Sensitive = false;
-            }
-        }
-
-
-        // Enables or disables the 'Next' button depending on the
-        // entries filled in by the user
-        public void CheckAddPage ()
-        {
-            SyncButton.Sensitive = false;
-
-            if (PathEntry.ExampleTextActive ||
-                (AddressEntry.Sensitive && AddressEntry.ExampleTextActive))
-                return;
-
-            bool IsFolder = !PathEntry.Text.Trim ().Equals ("");
-            bool IsServer = !AddressEntry.Text.Trim ().Equals ("");
-
-            if (AddressEntry.Sensitive == true) {
-                if (IsServer && IsFolder)
-                    SyncButton.Sensitive = true;
-            } else if (IsFolder) {
-                    SyncButton.Sensitive = true;
-            }
-        }
-
-
         private void RenderServiceColumn (TreeViewColumn column, CellRenderer cell,
             TreeModel model, TreeIter iter)
         {
diff --git a/build/build.rules.mk b/build/build.rules.mk
index a84f08ad..7740d5a4 100755
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -26,7 +26,7 @@ ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
 if ENABLE_TESTS
-    LINK += " $(NUNIT_LIBS)"
+    LINK = " $(NUNIT_LIBS)"
     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
 endif