#859: Polished dialog and removed cruft