More cleaning: no more execution batch object, nowhere - only used as a service