cleanup, working toward adding fab calls to test script