IPCM - cleaning up on failures