diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java
index 73cfdb50..70d26ba6 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java
@@ -113,7 +113,7 @@ public void load() {
         useRegionsScheduler = config.getBoolean(
                 "regions.use-scheduler", true);
         autoGodMode = config.getBoolean(
-                "auto-invincible-permission", false);
+                "auto-invincible", config.getBoolean("auto-invincible-permission", true));
         usePlayerMove = config.getBoolean(
                 "use-player-move-event", true);
 
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
index 9ca8249f..5093d989 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java
@@ -80,9 +80,7 @@ public class WorldConfiguration {
     /* Configuration data start */
     public boolean opPermissions;
     public boolean fireSpreadDisableToggle;
-    public boolean enforceOneSession;
     public boolean itemDurability;
-    // public boolean classicWater;
     public boolean simulateSponge;
     public int spongeRadius;
     public boolean disableExpDrops;
@@ -104,11 +102,6 @@ public class WorldConfiguration {
     public boolean blockEnderDragonBlockDamage;
     public boolean blockFireballExplosions;
     public boolean blockFireballBlockDamage;
-    // public int loginProtection;
-    // public int spawnProtection;
-    // public boolean kickOnDeath;
-    // public boolean exactRespawn;
-    // public boolean teleportToHome;
     public boolean disableContactDamage;
     public boolean disableFallDamage;
     public boolean disableLavaDamage;
@@ -285,13 +278,11 @@ private void loadConfiguration() {
 
         opPermissions = getBoolean("op-permissions", true);
 
-        enforceOneSession = getBoolean("protection.enforce-single-session", true);
         itemDurability = getBoolean("protection.item-durability", true);
         removeInfiniteStacks = getBoolean("protection.remove-infinite-stacks", false);
         disableExpDrops = getBoolean("protection.disable-xp-orb-drops", false);
         disableObsidianGenerators = getBoolean("protection.disable-obsidian-generators", false);
 
-        // classicWater = getBoolean("simulation.classic-water", false);
         simulateSponge = getBoolean("simulation.sponge.enable", true);
         spongeRadius = Math.max(1, getInt("simulation.sponge.radius", 3)) - 1;
         redstoneSponges = getBoolean("simulation.sponge.redstone", false);
@@ -321,12 +312,6 @@ private void loadConfiguration() {
         antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
         disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
 
-        // loginProtection = getInt("spawn.login-protection", 3);
-        // spawnProtection = getInt("spawn.spawn-protection", 0);
-        // kickOnDeath = getBoolean("spawn.kick-on-death", false);
-        // exactRespawn = getBoolean("spawn.exact-respawn", false);
-        // teleportToHome = getBoolean("spawn.teleport-to-home-on-death", false);
-
         disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
         disableLavaDamage = getBoolean("player-damage.disable-lava-damage", false);
         disableFireDamage = getBoolean("player-damage.disable-fire-damage", false);
@@ -382,7 +367,7 @@ private void loadConfiguration() {
                 }
             }
         }
-        
+
         // useiConomy = getBoolean("iconomy.enable", false);
         // buyOnClaim = getBoolean("iconomy.buy-on-claim", false);
         // buyOnClaimPrice = getDouble("iconomy.buy-on-claim-price", 1.0);
@@ -459,9 +444,6 @@ private void loadConfiguration() {
 
         // Print an overview of settings
         if (getBoolean("summary-on-start", true)) {
-            logger.log(Level.INFO, enforceOneSession
-                    ? "WorldGuard: (" + worldName + ") Single session is enforced."
-                    : "WorldGuard: (" + worldName + ") Single session is NOT ENFORCED.");
             logger.log(Level.INFO, blockTNTExplosions
                     ? "WorldGuard: (" + worldName + ") TNT ignition is blocked."
                     : "WorldGuard: (" + worldName + ") TNT ignition is PERMITTED.");
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index c168bbf5..ee6c25ef 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -130,29 +130,6 @@ private void registerEvent(String typeName, Priority priority) {
         }
     }
 
-    /**
-     * Called when a player attempts to log in to the server.
-     */
-    /*
-    @Override
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        Player player = event.getPlayer();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(player.getWorld());
-
-        if (wcfg.enforceOneSession) {
-            String name = player.getName();
-
-            for (Player pl : plugin.getServer().getOnlinePlayers()) {
-                if (pl.getName().equalsIgnoreCase(name)) {
-                    pl.kickPlayer("Logged in from another location.");
-                }
-            }
-        }
-    }
-    */
-
     /**
      * Called when a player joins a server.
      */
diff --git a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java
index b6f2cc03..8e48fd69 100644
--- a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java
+++ b/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java
@@ -153,7 +153,6 @@ public boolean isChest(Material material) {
         return isChest(material.getId());
     }
 
-    @Override
     public boolean isChest(int type) {
         return type == BlockID.CHEST
                 || type == BlockID.DISPENSER