Removed more junk code