more dialog cleanup