evita: remove extra use cases