cleanup - now only has batch service