took out a lot of superfluous junk