Revert "more improvements for regression and code clean up"
*Uncommented necessary histogram updates
This reverts commit 93b3a157e8628405bd5ab41c6b7892cafb504b72.