diff -r ab35ea0f60b2 include/h.h
--- a/include/h.h	Sun May 19 08:09:02 2013 +0000
+++ b/include/h.h	Sun May 19 02:31:08 2013 -0600
@@ -42,8 +42,6 @@
 extern MODVAR struct stats *ircstp;
 extern MODVAR int bootopt;
 extern MODVAR time_t TSoffset;
-/* Prototype added to force errors -- Barubary */
-extern TS TS2ts(char *s);
 extern MODVAR time_t timeofday;
 /* newconf */
 #define get_sendq(x) ((x)->class ? (x)->class->sendq : MAXSENDQLENGTH) 
diff -r ab35ea0f60b2 src/channel.c
--- a/src/channel.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/channel.c	Sun May 19 02:31:08 2013 -0600
@@ -1786,7 +1786,7 @@
 
 	if (propagate)
 	{
-		sendto_serv_butone(cptr, ":%s MLOCK %B %s :%s",
+		sendto_serv_butone(cptr, ":%s MLOCK %lu %s :%s",
 					 cptr->name, chptr->creationtime, chptr->chname,
 					 BadPtr(chptr->mode_lock) ? "" : chptr->mode_lock);
 	}
diff -r ab35ea0f60b2 src/modules/m_mode.c
--- a/src/modules/m_mode.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/modules/m_mode.c	Sun May 19 02:31:08 2013 -0600
@@ -302,7 +302,7 @@
 		return 0;
 	}
 
-	if (IsServer(sptr) && (sendts = TS2ts(parv[parc - 1]))
+	if (IsServer(sptr) && (sendts = atol(parv[parc - 1]))
 	    && !IsULine(sptr) && chptr->creationtime
 	    && sendts > chptr->creationtime)
 	{
diff -r ab35ea0f60b2 src/modules/m_netinfo.c
--- a/src/modules/m_netinfo.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/modules/m_netinfo.c	Sun May 19 02:31:08 2013 -0600
@@ -119,7 +119,7 @@
 	}
 	/* is a long therefore not ATOI */
 	lmax = atol(parv[1]);
-	endsync = TS2ts(parv[2]);
+	endsync = atol(parv[2]);
 	protocol = atol(parv[3]);
 
 	/* max global count != max_global_count --sts */
diff -r ab35ea0f60b2 src/modules/m_server.c
--- a/src/modules/m_server.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/modules/m_server.c	Sun May 19 02:31:08 2013 -0600
@@ -368,7 +368,7 @@
 			return ret; /* FLUSH_BUFFER / failure */
 			
 		/* OK, let us check in the data now now */
-		hop = TS2ts(parv[2]);
+		hop = atol(parv[2]);
 		strlcpy(info, parv[parc - 1], REALLEN + 61);
 		strlcpy(cptr->name, servername, sizeof(cptr->name));
 		cptr->hopcount = hop;
@@ -538,7 +538,7 @@
 		return exit_client(cptr, cptr, &me, "Brought in banned server");
 	}
 	/* OK, let us check in the data now now */
-	hop = TS2ts(parv[2]);
+	hop = atol(parv[2]);
 	strlcpy(info, parv[parc - 1], REALLEN + 61);
 	if (!cptr->serv->conf)
 	{
diff -r ab35ea0f60b2 src/modules/m_svsmode.c
--- a/src/modules/m_svsmode.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/modules/m_svsmode.c	Sun May 19 02:31:08 2013 -0600
@@ -210,15 +210,8 @@
 	modebuf[0] = 0;
 	if(!(chptr = find_channel(parv[1], NULL)))
 		return 0;
-/*	if (parc >= 4) {
-			return 0;
-		if (parc > 4) {
-			ts = TS2ts(parv[4]);
-			if (acptr->since != ts)
-				return 0;
-		}
-	}*/
-	ts = TS2ts(parv[parc-1]);
+
+	ts = atol(parv[parc-1]);
 	for(m = parv[2]; *m; m++) {
 		switch (*m) {
 			case '+':
diff -r ab35ea0f60b2 src/modules/m_svsnick.c
--- a/src/modules/m_svsnick.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/modules/m_svsnick.c	Sun May 19 02:31:08 2013 -0600
@@ -110,11 +110,11 @@
 
 	if (acptr != ocptr)
 		acptr->umodes &= ~UMODE_REGNICK;
-	acptr->lastnick = TS2ts(parv[3]);
+	acptr->lastnick = atol(parv[3]);
 	sendto_common_channels(acptr, ":%s NICK :%s", parv[1], parv[2]);
 	add_history(acptr, 1);
 	sendto_serv_butone_token(NULL, parv[1], MSG_NICK, TOK_NICK,
-	                         "%s :%ld", parv[2], TS2ts(parv[3]));
+	                         "%s :%ld", parv[2], atol(parv[3]));
 
 	(void)del_from_client_hash_table(acptr->name, acptr);
 	hash_check_watch(acptr, RPL_LOGOFF);
diff -r ab35ea0f60b2 src/modules/m_topic.c
--- a/src/modules/m_topic.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/modules/m_topic.c	Sun May 19 02:31:08 2013 -0600
@@ -153,7 +153,7 @@
 		if (parc > 4)
 		{
 			tnick = parv[2];
-			ttime = TS2ts(parv[3]);
+			ttime = atol(parv[3]);
 			topic = parv[4];
 
 		}
diff -r ab35ea0f60b2 src/support.c
--- a/src/support.c	Sun May 19 08:09:02 2013 +0000
+++ b/src/support.c	Sun May 19 02:31:08 2013 -0600
@@ -49,14 +49,6 @@
 
 #define is_enabled match
 
-TS	TS2ts(char *s)
-{
-	if (*s == '!')
-		return (base64dec(s + 1));
-	else
-		return (atoi(s));	
-}
-
 char	*my_itoa(int i)
 {
 	static char buf[128];