Cleanups on histograms