remove Lucy, add CDI