Remove extra codes