Merge "Removing unused dialog code"