Simplify and fix delete key dialog