remove all cleanup code... will use a cron job instead