Remove more batch references from online