Redundant dialog class and redundant imports removed. Tests pass.