removed some more junk