diff --git a/sylk/configuration/settings.py b/sylk/configuration/settings.py
index f2cb833..b49d8f6 100644
--- a/sylk/configuration/settings.py
+++ b/sylk/configuration/settings.py
@@ -1,143 +1,142 @@
 # Copyright (C) 2010-2011 AG Projects. See LICENSE for details.
 #
 
 """
 SIP SIMPLE SDK settings extensions.
 """
 
 __all__ = ['AccountExtension', 'BonjourAccountExtension', 'SylkServerSettingsExtension']
 
 from sipsimple.account import MSRPSettings as AccountMSRPSettings, NATTraversalSettings as AccountNATTraversalSettings
 from sipsimple.account import RTPSettings as AccountRTPSettings, SIPSettings as AccountSIPSettings, TLSSettings as AccountTLSSettings
 from sipsimple.account import MessageSummarySettings as AccountMessageSummarySettings, PresenceSettings as AccountPresenceSettingss, XCAPSettings as AccountXCAPSettings
 from sipsimple.configuration import CorrelatedSetting, Setting, SettingsObjectExtension
 from sipsimple.configuration.datatypes import MSRPConnectionModel, MSRPTransport, NonNegativeInteger, PortRange, SampleRate, SIPTransportList, SRTPEncryption
 from sipsimple.configuration.settings import AudioSettings, EchoCancellerSettings, LogsSettings, RTPSettings, SIPSettings, TLSSettings
 
 from sylk import __version__ as server_version
 from sylk.configuration import ServerConfig, SIPConfig, MSRPConfig, RTPConfig
 from sylk.configuration.datatypes import AudioCodecs, NillablePath, Path, Port, SIPProxyAddress
 
 
 # Account settings extensions
 
 class AccountMessageSummarySettingsExtension(AccountMessageSummarySettings):
     enabled = Setting(type=bool, default=False)
 
 
 class AccountMSRPSettingsExtension(AccountMSRPSettings):
     transport = Setting(type=MSRPTransport, default='tls' if MSRPConfig.use_tls else 'tcp')
     connection_model = Setting(type=MSRPConnectionModel, default='relay' if ServerConfig.enable_bonjour else 'acm')
 
 
 class AccountNATTraversalSettingsExtension(AccountNATTraversalSettings):
-    use_msrp_relay_for_inbound = Setting(type=bool, default=False)
     use_msrp_relay_for_outbound = Setting(type=bool, default=False)
 
 
 class AccountPresenceSettingssExtension(AccountPresenceSettingss):
     enabled = Setting(type=bool, default=False)
 
 
 class AccountRTPSettingsExtension(AccountRTPSettings):
     audio_codec_list = Setting(type=AudioCodecs, default=None, nillable=True)
     srtp_encryption = Setting(type=SRTPEncryption, default=RTPConfig.srtp_encryption)
     use_srtp_without_tls = Setting(type=bool, default=True)
 
 
 class AccountSIPSettingsExtension(AccountSIPSettings):
     register = Setting(type=bool, default=False)
     outbound_proxy = Setting(type=SIPProxyAddress, default=SIPConfig.outbound_proxy, nillable=True)
 
 
 class AccountTLSSettingsExtension(AccountTLSSettings):
     certificate = Setting(type=NillablePath, default=ServerConfig.certificate, nillable=True)
     verify_server = Setting(type=bool, default=ServerConfig.verify_server)
 
 
 class AccountXCAPSettingsExtension(AccountXCAPSettings):
     enabled = Setting(type=bool, default=False)
 
 
 class AccountExtension(SettingsObjectExtension):
     enabled = Setting(type=bool, default=True)
 
     message_summary = AccountMessageSummarySettingsExtension
     msrp = AccountMSRPSettingsExtension
     nat_traversal = AccountNATTraversalSettingsExtension
     presence = AccountPresenceSettingssExtension
     rtp = AccountRTPSettingsExtension
     sip = AccountSIPSettingsExtension
     tls = AccountTLSSettingsExtension
     xcap = AccountXCAPSettingsExtension
 
 
 class BonjourAccountExtension(SettingsObjectExtension):
     enabled = Setting(type=bool, default=False)
 
 
 # General settings extensions
 
 class EchoCancellerSettingsExtension(EchoCancellerSettings):
     enabled = Setting(type=bool, default=False)
     tail_length = Setting(type=NonNegativeInteger, default=0)
 
 
 class AudioSettingsExtension(AudioSettings):
     input_device = Setting(type=str, default=None, nillable=True)
     output_device = Setting(type=str, default=None, nillable=True)
     sample_rate = Setting(type=SampleRate, default=RTPConfig.sample_rate)
     echo_canceller = EchoCancellerSettings
 
 
 class LogsSettingsExtension(LogsSettings):
     directory = Setting(type=Path, default=ServerConfig.trace_dir)
     trace_sip = Setting(type=bool, default=ServerConfig.trace_sip)
     trace_msrp = Setting(type=bool, default=ServerConfig.trace_msrp)
     trace_pjsip = Setting(type=bool, default=ServerConfig.trace_core)
     trace_notifications = Setting(type=bool, default=ServerConfig.trace_notifications)
 
 
 class RTPSettingsExtension(RTPSettings):
     audio_codec_list = Setting(type=AudioCodecs, default=RTPConfig.audio_codecs)
     port_range = Setting(type=PortRange, default=PortRange(RTPConfig.port_range.start, RTPConfig.port_range.end))
     timeout = Setting(type=NonNegativeInteger, default=RTPConfig.timeout)
 
 
 def sip_port_validator(port, sibling_port):
     if port == sibling_port != 0:
         raise ValueError("the TCP and TLS ports must be different")
 
 transport_list = []
 if SIPConfig.local_udp_port is not None:
     transport_list.append('udp')
 if SIPConfig.local_tcp_port is not None:
     transport_list.append('tcp')
 if SIPConfig.local_tls_port is not None:
     transport_list.append('tls')
 
 udp_port = SIPConfig.local_udp_port or 0
 tcp_port = SIPConfig.local_tcp_port or 0
 tls_port = SIPConfig.local_tls_port or 0
 
 class SIPSettingsExtension(SIPSettings):
     udp_port = Setting(type=Port, default=udp_port)
     tcp_port = CorrelatedSetting(type=Port, sibling='tls_port', validator=sip_port_validator, default=tcp_port)
     tls_port = CorrelatedSetting(type=Port, sibling='tcp_port', validator=sip_port_validator, default=tls_port)
     transport_list = Setting(type=SIPTransportList, default=transport_list)
 
 
 class TLSSettingsExtension(TLSSettings):
     ca_list = Setting(type=NillablePath, default=ServerConfig.ca_file, nillable=True)
 
 
 class SylkServerSettingsExtension(SettingsObjectExtension):
     user_agent = Setting(type=str, default='SylkServer-%s' % server_version)
 
     audio = AudioSettingsExtension
     logs = LogsSettingsExtension
     rtp = RTPSettingsExtension
     sip = SIPSettingsExtension
     tls = TLSSettingsExtension