Cleanups
Big binnedData cleanups.