Remove dialogs, implement new dialog fragment
Remove unused code