removed all the stuff we aren't using any more