Removed logic that should have been in cron