remove dead testutil code