bringing in changes from local fix to rpc, eliminated db cleanup on cron