Continued cleanup of statistics backend