remove some un-necessary token