Clean up p-and-c 1.1