remove no longer needed vars from batch structure