add locality and fix flavor deletion