added remove batch mode