diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
index 09bfd610..0bfd8634 100644
--- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
+++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
@@ -396,7 +396,7 @@ public class ConfigManager {
 				config.addDefault("Abilities.Water.Surge.Description", "This ability has two distinct features. If you sneak to select a source block, you can then click in a direction and a large wave will be launched in that direction. If you sneak again while the wave is en route, the wave will freeze the next target it hits. If, instead, you click to select a source block, you can hold sneak to form a wall of water at your cursor location. Click to shift between a water wall and an ice wall. Release sneak to dissipate it.");
 				config.addDefault("Abilities.Water.Surge.Wave.Radius", 3);
 				config.addDefault("Abilities.Water.Surge.Wave.Range", 20);
-				config.addDefault("Abilities.Water.Surge.Wave.SelectRange", 12);
+				config.addDefault("Abilities.Water.Surge.Wave.SelectRange", 6);
 				config.addDefault("Abilities.Water.Surge.Wave.HorizontalPush", 1);
 				config.addDefault("Abilities.Water.Surge.Wave.DynamicSourcing.Enabled", true);
 				config.addDefault("Abilities.Water.Surge.VerticalPush", 0.2);
@@ -502,9 +502,6 @@ public class ConfigManager {
 				config.addDefault("Abilities.Water.WaterSpout.Wave.FlightTime", 2500);
 				config.addDefault("Abilities.Water.WaterSpout.Wave.Speed", 1.3);
 				config.addDefault("Abilities.Water.WaterSpout.Wave.SelectRange", 12);
-				config.addDefault("Abilities.Water.WaterSpout.Wave.AutoSourcing.Enabled", true);
-				config.addDefault("Abilities.Water.WaterSpout.Wave.AutoSourcing.Cooldown", 1500);
-				config.addDefault("Abilities.Water.WaterSpout.Wave.AutoSourcing.SelectRange", 5);
 
 				config.addDefault("Abilities.Water.WaterCombo.Enabled", true);
 				config.addDefault("Abilities.Water.WaterCombo.IceWave.Damage", 4);
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterWave.java b/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
index bd3813c6..7d898507 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterWave.java
@@ -47,11 +47,6 @@ public class WaterWave {
 	public static double ICE_WAVE_DAMAGE = ProjectKorra.plugin.getConfig().getDouble("Abilities.Water.WaterCombo.IceWave.Damage");
 	
 	private static int selectRange = ProjectKorra.plugin.getConfig().getInt("Abilities.Water.WaterSpout.Wave.SelectRange");
-	private static int autoSelectRange = ProjectKorra.plugin.getConfig().getInt("Abilities.Water.WaterSpout.Wave.AutoSourcing.SelectRange");
-	private static boolean auto = ProjectKorra.plugin.getConfig().getBoolean("Abilities.Water.WaterSpout.Wave.AutoSourcing.Enabled");
-	private static long autocooldown = ProjectKorra.plugin.getConfig().getLong("Abilities.Water.WaterSpout.Wave.AutoSourcing.Cooldown");
-	
-	private boolean isAuto;
 	
 	private Player player;
 	private long time;
@@ -112,18 +107,13 @@ public class WaterWave {
 			if (origin == null) {
 				removeType(player, AbilityType.CLICK);
 
-				Block block = BlockSource.getWaterSourceBlock(player, autoSelectRange, selectRange, ClickType.SHIFT_DOWN, auto, false, true, true, WaterMethods.canIcebend(player), WaterMethods.canPlantbend(player));
+				Block block = BlockSource.getWaterSourceBlock(player, selectRange, selectRange, ClickType.SHIFT_DOWN, false, false, true, true, WaterMethods.canIcebend(player), WaterMethods.canPlantbend(player));
 				if (block == null) {
 					if(instances.contains(this)) {
 						remove();
 					}
 					return;
 				}
-				if (BlockSource.isAuto(block)) {
-					isAuto = true;
-				} else {
-					isAuto = false;
-				}
 				instances.add(this);
 				Block blockAbove = block.getRelative(BlockFace.UP);
 				if (blockAbove.getType() != Material.AIR && !WaterMethods.isWaterbendable(blockAbove, player)) {
@@ -288,12 +278,8 @@ public class WaterWave {
 	public void remove() {
 		instances.remove(this);
 		BendingPlayer bPlayer = GeneralMethods.getBendingPlayer(player.getName());
-		if (bPlayer != null) {
-			if (isAuto) {
-				bPlayer.addCooldown("WaterWave", autocooldown);
-			} else {
-				bPlayer.addCooldown("WaterWave", cooldown);
-			}
+		if (bPlayer != null) {
+			bPlayer.addCooldown("WaterWave", cooldown);
 		}
 		revertBlocks();
 		for (BukkitRunnable task : tasks)