removed some stuff that I wasn't using,