first pass at removing token and pg.