removed some junk code