(sort of) clean up p1