diff --git a/ebin/egs.app b/ebin/egs.app
index 49df5dd..ecd1748 100644
--- a/ebin/egs.app
+++ b/ebin/egs.app
@@ -9,7 +9,6 @@
 		egs_exit_mon,
 		egs_user_model,
 		reloader,
-		egs_cron,
 		egs_db,
 		psu_game,
 		psu_login,
diff --git a/src/egs_cron.erl b/src/egs_cron.erl
deleted file mode 100644
index 16c7c99..0000000
--- a/src/egs_cron.erl
+++ /dev/null
@@ -1,41 +0,0 @@
-%	EGS: Erlang Game Server
-%	Copyright (C) 2010  Loic Hoguin
-%
-%	This file is part of EGS.
-%
-%	EGS is free software: you can redistribute it and/or modify
-%	it under the terms of the GNU General Public License as published by
-%	the Free Software Foundation, either version 3 of the License, or
-%	(at your option) any later version.
-%
-%	EGS is distributed in the hope that it will be useful,
-%	but WITHOUT ANY WARRANTY; without even the implied warranty of
-%	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%	GNU General Public License for more details.
-%
-%	You should have received a copy of the GNU General Public License
-%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
-
--module(egs_cron).
--export([start/0]). % external
--export([cleanup/0]). % internal
-
--include("include/records.hrl").
-
-%% @doc Start the cron processes.
-
-start() ->
-	Pid = spawn_link(?MODULE, cleanup, []),
-	{ok, Pid}.
-
-%% @doc Cleanup the users table of failures to log into the game server.
-
-cleanup() ->
-	receive
-		_ ->
-			?MODULE:cleanup()
-	after 300000 ->
-		egs_user_model:cleanup(),
-		reload,
-		?MODULE:cleanup()
-	end.
diff --git a/src/egs_sup.erl b/src/egs_sup.erl
index d109a08..a290498 100644
--- a/src/egs_sup.erl
+++ b/src/egs_sup.erl
@@ -49,8 +49,7 @@ upgrade() ->
 %% @doc supervisor callback.
 init([]) ->
 	%% Start egs_cron, egs_game, egs_login, egs_patch. To be replaced by configurable modules.
-	Processes = [{egs_cron, {egs_cron, start, []}, permanent, 5000, worker, dynamic},
-				 {egs_user_model, {egs_user_model, start_link, []}, permanent, 5000, worker, dynamic},
+	Processes = [{egs_user_model, {egs_user_model, start_link, []}, permanent, 5000, worker, dynamic},
 				 {psu_game, {psu_game, start_link, [?GAME_PORT]}, permanent, 5000, worker, dynamic},
 				 {psu_login_jp1, {psu_login, start_link, [?LOGIN_PORT_JP_ONE, 10000001]}, permanent, 5000, worker, dynamic},
 				 {psu_login_jp2, {psu_login, start_link, [?LOGIN_PORT_JP_TWO, 20000001]}, permanent, 5000, worker, dynamic},
diff --git a/src/egs_user_model.erl b/src/egs_user_model.erl
index 9b4736f..c4de4d8 100644
--- a/src/egs_user_model.erl
+++ b/src/egs_user_model.erl
@@ -19,7 +19,7 @@
 
 -module(egs_user_model).
 -behavior(gen_server).
--export([start_link/0, stop/0, count/0, read/1, select/1, write/1, delete/1, cleanup/0]). %% API.
+-export([start_link/0, stop/0, count/0, read/1, select/1, write/1, delete/1]). %% API.
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). %% gen_server.
 
 %% Use the module name for the server's name and for the table name.
@@ -70,13 +70,10 @@ write(User) ->
 delete(ID) ->
 	gen_server:cast(?SERVER, {delete, ID}).
 
-%% @spec cleanup() -> ok
-cleanup() ->
-	gen_server:cast(?SERVER, cleanup).
-
 %% gen_server
 
 init([]) ->
+	timer:apply_interval(30000, gen_server, cast, [?SERVER, cleanup]),
 	error_logger:info_report("egs_user_model started"),
 	{ok, undefined}.