Change clean operations not to return failure