Refactor some dialogs to extend a common interface

-Remove some unused code