Just some cleanup and fix the per pod stats to not halt the DB