The failure removal should go in a dedicated method and not being called inside the saveFailure method