Cleaning up p015