cleaned up a bunch more junk