Dialog clean-up

Same as the previous request with the debug output removed.