Improve cleanup to avoid failures

Change-Id: I9121e0b104a15a67b94f2f17a2827c75e33c576d
Signed-off-by: David Caro <dcaroest@redhat.com>