more AutoBatch cleanup