Dialog cleanup work