Not sure about all this complexity. Can't we just try to remove and if something fail we only swallow the error?