Cleanup of 'Dialogs' namespace