Remove junk code