removing refrences to flavor