In cleanup, delete only if there is something to delete