Removed the 'flavor' options that are no longer used.