Only clean dirty shards (partial commit)