clean batch operations

Change-Id: I7187de40bb5276d6ae9e9831e5d47d36e16560ad
8 files changed