diff --git a/bin/auto b/bin/auto
index e64b61b..de7d076 100755
--- a/bin/auto
+++ b/bin/auto
@@ -100,8 +100,7 @@ println <<'EOF';
 EOF
 println "* ".NAME." (version ".VER.".".SVER.".".REV.RSTAGE.") is starting up...";
 
-our ($APID, %TIMERS, $SOCKTIMEOUT);
-$SOCKTIMEOUT = 0;
+our ($APID, %TIMERS);
 
 # Check for debug mode.
 our $DEBUG = 0;
@@ -273,8 +272,6 @@ foreach my $cskey (keys %cservers) {
 	API::IRC::nick($cskey, $cservers{$cskey}{'nick'}[0]);
 	# Add to select.
 	$SELECT->add($SOCKET{$cskey});
-	# Set some other variables.
-	$Parser::IRC::got_001{$cskey} = 0;
 	# Success!
 	alog "** Successfully connected to server: ".$cskey;
 	dbug "** Successfully connected to server: ".$cskey;
@@ -319,7 +316,7 @@ while (1) {
 		}
 	}
 	# Socket check.
-	foreach my $sock ($SELECT->can_read($SOCKTIMEOUT)) {
+	foreach my $sock ($SELECT->can_read(1)) {
 		# Figure out what network is sending us data.
 		my $sockid;
 		foreach (keys %SOCKET) {
diff --git a/src/Parser/IRC.pm b/src/Parser/IRC.pm
index 0c8691d..f3390ab 100644
--- a/src/Parser/IRC.pm
+++ b/src/Parser/IRC.pm
@@ -85,14 +85,6 @@ sub num001
 	my ($svr, @ex) = @_;
 	
 	$got_001{$svr} = 1;
-	my $stst = 1;
-	foreach (keys %got_001) {
-		if (!$got_001{$_}) {
-			$stst = 0;
-			last;
-		}
-	}
-	$Auto::SOCKTIMEOUT = 1 if $stst; 
 	
 	# In case we don't get NICK from the server.
 	if (defined $botnick{$svr}{newnick}) {