diff --git a/Core/XMPPStream.m b/Core/XMPPStream.m
index 3ebe8a3db3..be82b6e1f1 100644
--- a/Core/XMPPStream.m
+++ b/Core/XMPPStream.m
@@ -1943,7 +1943,7 @@ - (BOOL)authenticateWithPassword:(NSString *)inPassword error:(NSError **)errPtr
 		
 		id <XMPPSASLAuthentication> someAuth = nil;
         
-		if ([self supportsSCRAMSHA1Authentication])
+/*		if ([self supportsSCRAMSHA1Authentication])
 		{
 			someAuth = [[XMPPSCRAMSHA1Authentication alloc] initWithStream:self password:password];
 			result = [self authenticate:someAuth error:&err];
@@ -1955,9 +1955,9 @@ - (BOOL)authenticateWithPassword:(NSString *)inPassword error:(NSError **)errPtr
 		}
 		else if ([self supportsPlainAuthentication])
 		{
-			someAuth = [[XMPPPlainAuthentication alloc] initWithStream:self password:password];
+*/			someAuth = [[XMPPPlainAuthentication alloc] initWithStream:self password:password];
 			result = [self authenticate:someAuth error:&err];
-		}
+/*		}
 		else if ([self supportsDeprecatedDigestAuthentication])
 		{
 			someAuth = [[XMPPDeprecatedDigestAuthentication alloc] initWithStream:self password:password];
@@ -1976,7 +1976,7 @@ - (BOOL)authenticateWithPassword:(NSString *)inPassword error:(NSError **)errPtr
 			err = [NSError errorWithDomain:XMPPStreamErrorDomain code:XMPPStreamUnsupportedAction userInfo:info];
 			
 			result = NO;
-		}
+		}*/
 	}};
 	
 	
@@ -4067,39 +4067,13 @@ - (void)tryNextSrvResult
 	
 	NSError *connectError = nil;
 	BOOL success = NO;
-	
-	while (srvResultsIndex < [srvResults count])
-	{
-		XMPPSRVRecord *srvRecord = [srvResults objectAtIndex:srvResultsIndex];
-		NSString *srvHost = srvRecord.target;
-		UInt16 srvPort    = srvRecord.port;
-		
-		success = [self connectToHost:srvHost onPort:srvPort withTimeout:XMPPStreamTimeoutNone error:&connectError];
-		
-		if (success)
-		{
-			break;
-		}
-		else
-		{
-			srvResultsIndex++;
-		}
-	}
-	
-	if (!success)
-	{
-		// SRV resolution of the JID domain failed.
-		// As per the RFC:
-		// 
-		// "If the SRV lookup fails, the fallback is a normal IPv4/IPv6 address record resolution
-		// to determine the IP address, using the "xmpp-client" port 5222, registered with the IANA."
-		// 
-		// In other words, just try connecting to the domain specified in the JID.
-		
-		success = [self connectToHost:[myJID_setByClient domain] onPort:5222 withTimeout:XMPPStreamTimeoutNone error:&connectError];
-	}
-	
-	if (!success)
+
+    //Check if app is for staging or production and set XMPPHostName accordingly
+    NSString *xmppHostName = @"xmpp.medigram-staging.com"; // TODO: change for release
+
+    success = [self connectToHost:xmppHostName onPort:5222 withTimeout:XMPPStreamTimeoutNone error:&connectError];
+
+    if (!success)
 	{
 		[self endConnectTimeout];
 		
diff --git a/Extensions/XEP-0054/XMPPvCardTempEmail.h b/Extensions/XEP-0054/XMPPvCardTempEmail.h
index 214efff848..a4abb75d1d 100644
--- a/Extensions/XEP-0054/XMPPvCardTempEmail.h
+++ b/Extensions/XEP-0054/XMPPvCardTempEmail.h
@@ -23,7 +23,5 @@
 @property (nonatomic, assign, setter=setX400:)      BOOL isX400;
 @property (nonatomic, assign, setter=setPreferred:) BOOL isPreferred;
 
-@property (nonatomic, weak) NSString *userid;
-
 
 @end
diff --git a/Vendor/KissXML/DDXML.h b/Vendor/KissXML/DDXML.h
index 43dbd75e1b..00cbcaa338 100644
--- a/Vendor/KissXML/DDXML.h
+++ b/Vendor/KissXML/DDXML.h
@@ -189,7 +189,7 @@
 // 
 // The debugging macro adds a significant amount of overhead, and should NOT be enabled on production builds.
 
-#if DEBUG
+#ifdef DEBUG
   #define DDXML_DEBUG_MEMORY_ISSUES 0
 #else
   #define DDXML_DEBUG_MEMORY_ISSUES 0 // Don't change me!