Cleanup of Intensity Binning

Removed merge tags and cleaned up extra test function.