pbc requests/responses cleanup - Phase1, half of Phase2