More lily cleanup