remove unnedded code and correct comment