More dialog cleanup