removed more cruft from wine formula