Flavour code cleaned