Dagger: cleanup