Fix bad merge of tell_sentry stuff
Clean up merge of LOG_METRICS from master
Remove the global db reference ... again