Just removed few unused line that I had commented