Remove more junk code