Removed documents batch plus some small fisex