leo: cleanup