Fix P&C Remover

Avoid modifying the result set while iterating