stats_utils: cleanup