comment out unused code
bug fix