Clean up flavor code.