Clean up and remove unused properties.
Accommodate the new-style dual submit buttons.