Clean up error batch system a bit