Started work on dialog cleanup