Patience: a bit of more cleaning