delete some unnecessary code
fixed encoding error