remove extra codes
remove extra codes