Comment out unused code which makes histgram
Fix a memory leak problem