Cleanup and added eq cron task