diff --git a/include/Swiften/Server/ServerStanzaChannel.cpp b/include/Swiften/Server/ServerStanzaChannel.cpp
index c68720975a01a60c2ed0bc34057647addbf9db64..9597cc1ca0a2503a20eb4e33f31b094f59ca1cf4 100644
--- a/include/Swiften/Server/ServerStanzaChannel.cpp
+++ b/include/Swiften/Server/ServerStanzaChannel.cpp
@@ -173,9 +173,4 @@ void ServerStanzaChannel::handleSessionInitialized() {
 	onAvailableChanged(true);
 }
 
-std::vector<Certificate::ref> ServerStanzaChannel::getPeerCertificateChain() const {
-	return std::vector<Certificate::ref>();
-}
-
-
 }
diff --git a/include/Swiften/Server/ServerStanzaChannel.h b/include/Swiften/Server/ServerStanzaChannel.h
index cc7a2754cf6e3077a991942532d02b38bedf84b7..2a562761a31a44c5169748e17e137d1daeece42c 100644
--- a/include/Swiften/Server/ServerStanzaChannel.h
+++ b/include/Swiften/Server/ServerStanzaChannel.h
@@ -32,7 +32,6 @@ namespace Swift {
 			bool getStreamManagementEnabled() const {
 				return false;
 			}
-		        virtual std::vector<Certificate::ref> getPeerCertificateChain() const;
 	
 			bool isAvailable() const {
 				return true;
diff --git a/src/transport.cpp b/src/transport.cpp
index 97ec6dc245048c3eb2cb55e04b334e195ee36daa..34d6dc745a62360b97192f4e3e03eb5f5765883f 100644
--- a/src/transport.cpp
+++ b/src/transport.cpp
@@ -82,12 +82,10 @@ Component::Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories,
 		LOG4CXX_INFO(logger, "Creating component in server mode on port " << CONFIG_INT(m_config, "service.port"));
 		m_server = new Swift::Server(loop, m_factories, m_userRegistry, m_jid, CONFIG_INT(m_config, "service.port"));
 		if (!CONFIG_STRING(m_config, "service.cert").empty()) {
+#ifndef _WIN32
+//TODO: fix
 			LOG4CXX_INFO(logger, "Using PKCS#12 certificate " << CONFIG_STRING(m_config, "service.cert"));
 			LOG4CXX_INFO(logger, "SSLv23_server_method used.");
-#ifdef _MSC_VER
-			TLSServerContextFactory *f = new SchannelServerContextFactory();
-			m_server->addTLSEncryption(f, boost::make_shared<CAPICertificate>(CONFIG_STRING(m_config, "service.cert")));
-#else
 			TLSServerContextFactory *f = new OpenSSLServerContextFactory();
 			m_server->addTLSEncryption(f, boost::make_shared<PKCS12Certificate>(CONFIG_STRING(m_config, "service.cert"), createSafeByteArray(CONFIG_STRING(m_config, "service.cert_password"))));
 #endif