diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 2d15e0a530..831701dba6 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1126,6 +1126,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         #endregion
 
         #region Generic Permissions
+        /* this still does nothing but waste time
         protected bool GenericCommunicationPermission(UUID user, UUID target)
         {
             // Setting this to true so that cool stuff can happen until we define what determines Generic Communication Permission
@@ -1144,6 +1145,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return permission;
         }
+        */
 
         public bool GenericEstatePermission(UUID user)
         {
@@ -1551,6 +1553,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         private bool CanInstantMessage(UUID user, UUID target)
         {
+            return true; // we still did not define this
+            /*
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
@@ -1561,14 +1565,18 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 user = part.OwnerID;
 
             return GenericCommunicationPermission(user, target);
+            */
         }
 
         private bool CanInventoryTransfer(UUID user, UUID target)
         {
+            return true; // we still did not define this
+            /*
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
             return GenericCommunicationPermission(user, target);
+            */
         }
 
         private bool CanIssueEstateCommand(UUID user, bool ownerCommand)
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 271f4e2bc6..3c2f2618c1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -859,13 +859,6 @@
     shout_distance = 100
 
 [EntityTransfer]
-    ; The maximum distance in regions that an agent is allowed to teleport
-    ; along the x or y axis. This is set to 65535 because current viewers
-    ; can't handle teleports that are greater than this distance
-    ; Setting to 0 will allow teleports of any distance
-    ;
-    max_distance = 65535
-
     ; Allow avatars to cross into and out of the region.
     AllowAvatarCrossing = true