remove more junk code